preparing 1.0.7SNAP-1-0-6e

27 files changed, 10243 insertions, 9347 deletions

diff --git a/ChangeLog b/ChangeLog
index 6882c2830..815e91529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-19  Werner Koch  <[email protected]>
+
+	Released 1.0.6e snapshot.
+
 2002-04-12  Werner Koch  <[email protected]>
 
 	* configure.ac: Add a warning note to the definition of the
diff --git a/THANKS b/THANKS
index c367c2c89..c7453d955 100644
--- a/THANKS
+++ b/THANKS
@@ -115,6 +115,7 @@ Marco d'Itri               [email protected]
 Marcus Brinkmann           [email protected]	
 Mark Adler		   [email protected]
 Mark Elbrecht		   [email protected]
+Mark Pettit                [email protected]
 Markus Friedl		   [email protected]
 Martin Kahlert		   [email protected]
 Martin Hamilton
diff --git a/TODO b/TODO
index 11661eeaa..b0ab8bf4a 100644
--- a/TODO
+++ b/TODO
@@ -61,9 +61,6 @@
   * Replace the printing of the user name by [self-signature] when
     appropriate so that a key listing does not get clobbered.
 
-  * Check that the way we select cipher and digest algorithms w/o
-    preferences is okay and make AES the default in some future.
-
   * Concatenated encryption messages don't work corectly - only the
     first one is processed.
 
@@ -87,7 +84,7 @@
 
   * add test cases for invalid data (scrambled armor or other random data)
 
-  * add checking of armor trailers
+  * add checking of armor trailers.  Try to detect garbled header lines.
 
   * the pubkey encrypt functions should do some sanity checks.
 
diff --git a/checks/ChangeLog b/checks/ChangeLog
index 02e4031ad..3c27c8d76 100644
--- a/checks/ChangeLog
+++ b/checks/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-19  Werner Koch  <[email protected]>
+
+	* signencrypt-dsa.test, sigs-dsa.test: Don't check with MD5 as
+	this is not valid with DSA signatures.
+
 2001-12-22  Werner Koch  <[email protected]>
 
 	* options.in: Add no-permission-warning.
diff --git a/checks/signencrypt-dsa.test b/checks/signencrypt-dsa.test
index 8121dd86e..41bf83164 100755
--- a/checks/signencrypt-dsa.test
+++ b/checks/signencrypt-dsa.test
@@ -10,7 +10,7 @@ for i in $plain_files $data_files ; do
     cmp $i y || error "$i: mismatch"
 done
 
-for da in ripemd160 sha1 md5; do
+for da in ripemd160 sha1; do
     for i in $plain_files; do
 	$GPG $dsa_keyrings --always-trust -se -o x --yes --digest-algo $da \
 		    -u "$dsa_usrname1" -r "$dsa_usrname2" $i
diff --git a/checks/sigs-dsa.test b/checks/sigs-dsa.test
index 647e53f9b..2294cf55a 100755
--- a/checks/sigs-dsa.test
+++ b/checks/sigs-dsa.test
@@ -9,7 +9,7 @@ for i in $plain_files $data_files; do
     cmp $i y || error "$i: mismatch"
 done
 
-for da in ripemd160 sha1 md5; do
+for da in ripemd160 sha1; do
     for i in $plain_files; do
 	$GPG $dsa_keyrings --digest-algo $da \
 				-s -o x --yes -u $dsa_usrname1 $i
diff --git a/configure.ac b/configure.ac
index 4fc69bbe7..d0cde8d38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Configure.ac script for GnuPG
-dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GnuPG.
 dnl
@@ -24,7 +24,7 @@ AC_PREREQ(2.52)
 dnl A snapshot release has a letter appended.  CVS files before a release
 dnl are suffixed with the string "-cvs", so "1.0.6a-cvs" is a cvs version
 dnl between 1.0.6 and 1.0.6a. 
-AC_INIT(gnupg, 1.0.6e-cvs, [email protected])
+AC_INIT(gnupg, 1.0.6e, [email protected])
 ALL_LINGUAS="cs da de eo el es et fr gl id it ja nl pl pt_BR pt sv tr"
 static_modules="sha1 md5 rmd160"
 static_random_module=""
diff --git a/doc/gpg.texi b/doc/gpg.texi
index f1de7be10..202ac1835 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -376,6 +376,8 @@ The second form of the command has the special property to
 render the secret part of the primary key useless; this is
 a GNU extension to OpenPGP and other implementations can
 not be expected to successfully import such a key.
+See the option ---simple-sk-checksum if you want to import such an
+exported key with an older OpenPGP implementation.
 
 @item ---import @code{files}
 @itemx ---fast-import @code{files}
@@ -617,17 +619,12 @@ For keyserver schemes that use HTTP (such as HKP), try to access the
 keyserver over the proxy set with the environment variable
 "http_proxy".
 
-@end table
-
-@item ---auto-key-retrieve
+@item auto-key-retrieve
 This option enables the automatic retrieving of keys from a keyserver
 when verifying signatures made by keys that are not on the local
 keyring.
 
-@item ---no-auto-key-retrieve
-This option disables the automatic retrieving of keys from a keyserver
-while verifying signatures. This may be of use if ---auto-key-retrieve
-is enabled from an options file.
+@end table
 
 @item ---keyring @code{file}
 Add @code{file} to the list of keyrings.
@@ -823,6 +820,14 @@ a 3 iterates the whole process a couple of times.
 Unless ---rfc1991 is used, this mode is also used
 for conventional encryption.
 
+@item ---simple-sk-checksum
+Secret keys are integrity protected by using a SHA-1 checksum. This
+method will be part of an enhanced OpenPGP specification but GnuPG
+already uses it as a countermeasure against certain attacks. Old
+applications don't understand this new format, so this option may be
+used to switch back to the old behaviour. Using this this option
+bears a security risk.
+
 @item ---compress-algo @code{n}
 Use compression algorithm @code{n}. Default is 2 which is RFC1950
 compression. You may use 1 to use the old zlib version (RFC1951) which
@@ -918,8 +923,9 @@ a message that PGP 2.x will not be able to handle. Note that `PGP
 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x
 available, but the MIT release is a good common baseline.
 
-This option implies `---rfc1991 --no-openpgp --no-force-v4-certs
----no-comment --escape-from --no-force-v3-sigs --cipher-algo IDEA
+This option implies `---rfc1991 --no-openpgp --disable-mdc
+---no-force-v4-certs --no-comment --escape-from --force-v3-sigs
+---no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
 ---digest-algo MD5 --compress-algo 1'
 
 @item ---no-pgp2
diff --git a/po/ChangeLog b/po/ChangeLog
index 5e35ccd60..32105cc05 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-19  Werner Koch  <[email protected]>
+
+	* de.po: Fixed fuzzies and added a few translations.
+
 2002-04-18  Werner Koch  <[email protected]>
 
 	* eo.po: Updated.
diff --git a/po/cs.po b/po/cs.po
index f294e6b48..d740da53c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.7\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-04-09 10:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "ukon�it"
 
@@ -271,7 +271,7 @@ msgstr "... toto je chyba v programu (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "nalezena chyba v programu ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -347,7 +347,7 @@ msgstr ""
 "Nedostatek n�hodn�ch bajt�. Pros�m, pracujte s opera�n�m syst�mem, abyste\n"
 "mu umo�nili z�skat v�ce entropie (je pot�eba %d bajt�).\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -355,169 +355,169 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[soubor]|�ifrovat soubor"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "pouze ulo�en�"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[soubor]|de�ifrovat soubor"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "zkontrolovat podpisy kl���"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a miniatur (fingerprint)"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "podepsat kl�� bez mo�nosti revokace podpisu"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "podepsat kl�� lok�ln� a bez mo�nosti\n"
 " revokace podpisu"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "vypsat pouze po�ad� paket�"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr ""
 "exportovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr ""
 "importovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "neinteraktivn� aktualizace datab�ze d�v�ry"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "opravit naru�enou datab�zi d�v�ry"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Dek�dovat ASCII soubor nebo std. vstup"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Zak�dovat soubor nebo std. vstup do ASCII"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]|vypi� hash"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -527,214 +527,214 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|JM�NO|pou��t JM�NO jako implicitn�ho adres�ta"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr ""
 "pou��t implicitn� kl�� jako implicitn�ho\n"
 " adres�ta"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��vat termin�l"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "vynutit podpisy verze 3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "nevynucovat podpisy verze 3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "vynutit podpisy verze 4"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "nevynucovat podpisy verze 4"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "pro �ifrov�n� v�dy pou��t MDC"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "pro �ifrov�n� nikdy nepou��t MDC"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "pou�ijte gpg-agenta"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy se na nic neptat"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "automaticky odpov�d�t ANO na v�t�inu ot�zek"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "automaticky odpov�d�t NE na v�t�inu ot�zek"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "p�idat tento soubor kl��� do seznamu\n"
 " pou��van�ch soubor� kl���"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "p�idat tento soubor tajn�ch kl��� do seznamu"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "uka� ve kter�m souboru kl��� je vypsan� kl��"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|JM�NO|pou�ij JM�NO jako implicitn� tajn� kl��"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�ij tento server kl��� pro vyhled�v�n�\n"
 " kl���"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|nastav znakovou sadu termin�lu na JM�NO"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "��st nastaven� ze souboru"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[SOUBOR]|zapi� informaci o stavu do SOUBORu"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KL��|�pln� d�v��ovat tomuto kl��i"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|SOUBOR|nahr�t roz�i�uj�c� modul SOUBOR"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emulovat m�d popsan� v RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "nastav v�echny vlastnosti paket�, �ifer\n"
 " a hash� jako v OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "nastav v�echny vlastnosti paket�, �ifer\n"
 " a hash� jako v PGP 2.x"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|pou��t m�d hesla N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|pou��t hashovac� algoritmus ALG pro hesla"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|pou��t �ifrovac� algoritmus ALG pro hesla"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou��t �ifrovac� algoritmus ALG"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou��t hashovac� algoritmus ALG"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou��t kompresn� algoritmus N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "zahodit identifik�tor kl��e z �ifrovan�ch\n"
 " paket�"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Zobrazit fotografick� ID"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazovat fotografick� ID"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavit p��kazov� ��dek k prohl��en�\n"
 " fotografick�ho ID"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|JM�NO=HODNOTA|pou��t tento z�pis dat"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +742,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -760,17 +760,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat miniatury (fingerprint)\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -780,7 +780,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -788,250 +788,250 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "tato zpr�va nen� pro PGP 2.x pou�iteln�\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompresn� algoritmus mus� b�t v rozmez� %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� kontroly; mus� b�t 0, 1, 2 nebo 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "neplatn� p�edvolby \n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nelze otev��t %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "prvn� znak jm�na mus� b�t p�smeno nebo podtr��tko\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1039,11 +1039,11 @@ msgstr ""
 "jm�no m��e obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka a kon�it "
 "s '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "te�ky ve jm�n� mus� b�t obklopeny jin�mi znaky\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
@@ -1340,12 +1340,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
@@ -1367,7 +1367,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
@@ -1384,100 +1384,101 @@ msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "nezn�m� implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "p�edvolba %c%lu nen� platn�\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "duplicita p�edvolby %c%lu\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "p��li� mnoho `%c' p�edvoleb\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "neplatn� znak v �et�zci\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "zapisuji podpis kl��e sebou sam�m\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (pro �ifrov�n� a podpis)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Pou�it� tohoto algoritmu se ji� nedoporu�uje - chcete ho p�esto vytvo�it? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1490,21 +1491,21 @@ msgstr ""
 "                      implicitn� velikost kl��e je 1024 bit�\n"
 "             nejvy��� navrhovan� velikost kl��e je 2048 bit�\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Jakou velikost kl��e si p�ejete? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Kl�� DSA mus� m�t velikost od 512 do 1024 bit�.\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost pro RSA je 1024 "
 "bit�.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost je 768 bit�.\n"
@@ -1517,12 +1518,12 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "velikost kl��e je p��li� velk�; maxim�ln� dovolen� hodnota je %d.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1530,11 +1531,11 @@ msgstr ""
 "Velikosti kl��e v�t�� jak 2048 bit� se nedoporu�uj�, proto�e\n"
 "v�po�ty pak trvaj� VELMI dlouho!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Opravdu chcete vytvo�it kl�� t�to d�lky? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1542,17 +1543,17 @@ msgstr ""
 "Dob�e, ale nezapome�te, �e informace mohou b�t vyzrazeny z po��ta�e tak� "
 "elektromagnetick�m vyza�ov�n�m monitoru nebo kl�vesnice!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1568,7 +1569,7 @@ msgstr ""
 "      <n>m = doba platnosti kl��e skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti kl��e skon�� za n let\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1584,30 +1585,30 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n m�s�c�\n"
 "      <n>y = doba platnosti podpisu skon�� za n let\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� pro? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "platnost %s skon�� %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1615,11 +1616,11 @@ msgstr ""
 "V� syst�m neum� zobrazit data po roce 2038.\n"
 "V ka�d�m p��pad� budou data korektn� zpracov�v�na do roku 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Je to spr�vn� (a/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1635,44 +1636,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1683,29 +1684,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jm�no nebo koment�� nepi�te, pros�m, e-mailovou adresu.\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zm�nit (J)m�no, (K)oment��, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zm�nit (J)m�no, (K)oment��, (E)-mail, (P)okra�ovat d�l nebo (U)kon�it "
 "program? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1713,16 +1714,16 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1734,7 +1735,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1747,53 +1748,53 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru ve�ejn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "ve�ejn� a tajn� kl�� byly vytvo�eny a podeps�ny.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "kl�� ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1801,12 +1802,12 @@ msgstr ""
 "Tento kl�� nem��e b�t pou�it� pro �ifrov�n�. K vytvo�en�\n"
 "sekund�rn�ho kl��e pro tento ��el m��ete pou��t p��kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1814,7 +1815,7 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1822,11 +1823,11 @@ msgstr ""
 "kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
 "je probl�m se syst�mov�m �asem)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvo�en� podkl��e pro kl��e v3 nen� v souladu s OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Opravdu vytvo�it? "
 
@@ -1845,7 +1846,7 @@ msgstr "`%s' je ji� zakomprimov�n\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: nemohu otev��t: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -1910,21 +1911,21 @@ msgstr "p��li� mnoho polo�ek v bufferu ve�ej�ch kl��� - vypnuto\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[User ID not found]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %08lX, platnost vynucena --always-trust\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "pou��v�m sekund�rn� kl�� %08lX m�sto prim�rn�ho kl��e %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kl�� %08lX: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -2038,7 +2039,7 @@ msgstr "kl�� %08lX: nov� kl�� - p�esko�en\n"
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
@@ -2224,118 +2225,128 @@ msgstr "kl�� %08lX: p�id�n revoka�n� certifik�t\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "kl�� %08lX: podpis kl��e j�m sam�m (direct key signature)\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Jste si jist�(�) �e st�le chcete podepsat tento kl��?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Opravdu jej chcete st�le p�idat? (a/n) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Skute�n� podepsat? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Va� sou�asn� podpis \"%s\"\n"
+"je pouze lok�ln�.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"P�ejete si jej zm�nit na exportovateln�?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Va� sou�asn� podpis \"%s\"\n"
 "je pouze lok�ln�.\n"
 "\n"
 "P�ejete si jej zm�nit na exportovateln�?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" je ji� %s podeps�no kl��em %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" je ji� %s podeps�no kl��em %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nic k podeps�n� kl��em %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Jste si jist�(�), �e st�le chcete podepsat kl��?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Skute�n� podepsat? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (a/n) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "v m�du --pgp2 m��ete pouze podepisovat s kl��i form�tu PGP-2.x\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "tato zpr�va nen� pro PGP 2.x pou�iteln�\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2345,27 +2356,27 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��se�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2373,7 +2384,7 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2382,7 +2393,7 @@ msgstr ""
 "Podpis bude ozna�en jako neexportovateln�.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2391,7 +2402,7 @@ msgstr ""
 "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2399,7 +2410,7 @@ msgstr ""
 "\n"
 "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2407,7 +2418,7 @@ msgstr ""
 "\n"
 "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2415,29 +2426,33 @@ msgstr ""
 "\n"
 "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Skute�n� podepsat? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2445,7 +2460,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2453,445 +2468,452 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Opravdu to chcete ud�lat? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "ulo�it"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "vypsat miniaturu (fingerprint)"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "vyberte sekund�rn� kl�� N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "vypsat seznam podpis�"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "podepsat kl��"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "podepsat kl�� bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat kl�� lok�ln� a  bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "smazat identifik�tor u�ivatele"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "p�idat sekund�rn� kl��"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "zm�nit dobu platnosti"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "p�epnout mezi vyps�n�m seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "nastavit seznam p�edvoleb"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "aktualizovat p�edvolby"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, 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:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "Kl�� revokov�n.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Opravdu podepsat v�echny id u�ivatele? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Opravdu chcete smazat vybran� kl��e? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Opravdu chcete smazat tento kl��? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Opravdu chcete revokovat vybran� kl��e? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Opravdu chcete revokovat tento kl��? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Opravdu aktualizovat p�edvoleby pro vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Opravdu aktualizovat p�edvolby? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Ulo�it zm�ny? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Ukon�it bez ulo�en�? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 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:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s%s\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  vytvo�en: %s platnost skon��: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr "d�v�ra: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podkl�� byl revokov�n: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- nalezena pad�lan� revokace\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�m ov��en� revokace: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2899,16 +2921,16 @@ msgstr ""
 "VAROV�N�: Tento kl�� ji� obsahuje fotografick� ID.\n"
 "         P�id�n� dal�� fotografie m��e zm�st n�kter� verze PGP.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Opravdu jej chcete st�le p�idat? (a/n) "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "M�li byste m�t jen jedno fotografick� ID na kl��i.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2917,83 +2939,83 @@ 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:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazn�no.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 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:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "id u�ivatele: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3002,7 +3024,7 @@ msgstr ""
 "\"\n"
 "podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3011,64 +3033,69 @@ msgstr ""
 "\"\n"
 "podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Opravdu jej chcete st�le p�idat? (a/n) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   podeps�no %08lX v %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokov�no %08lX v %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   podeps�no %08lX v %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu datumu\n"
 
@@ -3086,7 +3113,7 @@ msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnost skon��: %s]"
@@ -3176,75 +3203,75 @@ msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notace: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Politika: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis vytvo�en %.*s pomoc� %s kl��e s identifik�torem u�ivatele %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "�PATN� podpis od \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Podpis s vypr�enou platnost� od \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[nejist�]  "
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -3288,7 +3315,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -3504,42 +3531,46 @@ msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Neplatn� heslo; pros�m, zkuste to znovu"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VAROV�N�: Objeven slab� kl�� - zm��te, pros�m, znovu heslo.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "toto je kl�� algoritmu ElGamal vygenerovan� v PGP - podpisy j�m vytvo�en� "
 "NEJSOU bezpe�n�!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "ve�ejn� kl�� je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "ve�ejn� kl�� je o %lu sekund nov�j�� ne� podpis\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "POZN�MKA: podpisov�mu kl��i %08lX skon�ila platnost %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "p�edpokl�d�m �patn� podpis, proto�e je nastaven nezn�m� kritick� bit\n"
 
@@ -3551,40 +3582,40 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis od: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 m��ete pouze podepisovat s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: nemohu vytvo�it: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -3599,12 +3630,12 @@ msgstr "nemohu pracovat s ��dky del��mi ne� %d znak�\n"
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: lseek() se nepoda�il: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "z�znam v datab�zi d�v�ry %lu: z�pis se nepoda�il (n=%d): %s\n"
@@ -3668,131 +3699,131 @@ msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba p�i aktualizaci z�znamu verze: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba p�i �ten� z�znamu verze: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba p�i z�pisu z�znamu verze: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "datab�ze d�v�ry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nen� soubor datab�ze d�v�ry\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: z�znam verze s ��slem %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatn� verze souboru %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri �ten� voln�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulov�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: p�id�n� z�znamu selhalo: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "datab�ze d�v�ry je po�kozena; pros�m spus�te \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "kl�� %08lX: akceptov�n jako d�v�ryhodn� kl��\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "kl�� %08lX se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "kl�� %08lX: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ po�. %d: �ten� selhalo: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrolova datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "ve�ejn� kl�� %08lX nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "kontrola v hloubce %d podeps�no=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -3908,6 +3939,10 @@ msgstr ""
 "nemohu se vyvarovat slab�ho kl��e pro symetrickou �ifru; operaci jsem zkusil "
 "%d kr�t!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
@@ -3925,12 +3960,16 @@ msgstr "Toto je tajn� kl��! - opravdu smazat? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
@@ -4345,6 +4384,16 @@ msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Jste si jist�(�) �e st�le chcete podepsat tento kl��?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Jste si jist�(�), �e st�le chcete podepsat kl��?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Skute�n� podepsat? "
+
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Opravdu pot�ebujete tak dlouh� kl��? "
 
diff --git a/po/da.po b/po/da.po
index 6a6c93966..ea7166e41 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "afslut"
 
@@ -277,7 +277,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -353,7 +353,7 @@ msgstr ""
 "Ikke nok tilf�ldige byte tilg�ngelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +361,170 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,208 +534,208 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,16 +755,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +774,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,268 +782,268 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "vis pr�ferencer"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
 "understregning\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -1329,12 +1329,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
@@ -1356,7 +1356,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
@@ -1374,100 +1374,100 @@ msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr ""
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1476,19 +1476,19 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillader kun n�glest�rrelser fra 512 til 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
@@ -1500,38 +1500,38 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1541,7 +1541,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1551,42 +1551,42 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1596,44 +1596,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1644,28 +1644,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1673,17 +1673,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1691,7 +1691,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1699,80 +1699,80 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr ""
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
@@ -1791,7 +1791,7 @@ msgstr ""
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan ikke �bne: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -1855,22 +1855,22 @@ msgstr ""
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1984,7 +1984,7 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -2169,837 +2169,853 @@ msgstr ""
 msgid "key %08lX: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+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:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Vil du gerne signere? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Vil du gerne signere? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Vil du gerne signere? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "slet bruger id"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "showpref"
 msgstr "vispr�f"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undern�gle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, 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:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, 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:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr ""
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
@@ -3017,7 +3033,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
@@ -3104,74 +3120,74 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr ""
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -3212,7 +3228,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -3423,41 +3439,45 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "ugyldig kodes�tning"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -3467,39 +3487,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -3514,12 +3534,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3583,131 +3603,131 @@ msgstr ""
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3815,6 +3835,10 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
@@ -3832,12 +3856,16 @@ msgstr ""
 msgid "deleting keyblock failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
@@ -4145,6 +4173,18 @@ msgstr "vis n�gler og signaturer"
 msgid "%s: keyring created\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Vil du gerne signere? "
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key bruger-id"
 
diff --git a/po/de.po b/po/de.po
index c5f4f7881..c54c06e9f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-04-09 19:41+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "quit"
 
@@ -274,7 +274,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[Dateien]|Dateien verschl�sseln"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[Dateien]|Dateien entschl�sseln"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "Schl�ssel nicht widerrufbar signieren"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "Schl�ssel nur f�r diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "unbeaufsichtigtes �ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,202 +526,202 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "Beim Verschl�sseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "Empf�nger-ID verschl�sselter Pakete entfernen"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|diese \"notation\"-Daten verwenden"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -730,7 +730,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -750,17 +750,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -770,7 +770,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -778,258 +778,258 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "WARNUNG: %s ist eine mi�billigte Option.\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"--keyserver-option %s\".\n"
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "Diese Botschaft k�nnte f�r PGP 2.x unbrauchbar sein\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "ung�ltige Voreinstellungen\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
 "ein Unterstrich sein\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1037,12 +1037,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1348,12 +1348,12 @@ msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
@@ -1375,7 +1375,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
@@ -1393,100 +1393,100 @@ msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "Voreinstellung %c%lu ist nicht g�ltig\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "Voreinstellung %c%lu ist doppelt\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "zu viele `%c' Voreinstellungen\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
-msgstr "Ung�ltiges Zeichen in der Zeichenkette\n"
+#: g10/keygen.c:257
+msgid "invalid character in preference string\n"
+msgstr "Ung�ltiges Zeichen in den Voreinstellungen\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1499,19 +1499,19 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
@@ -1523,12 +1523,12 @@ msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1536,11 +1536,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1548,17 +1548,17 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1574,7 +1574,7 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1590,30 +1590,30 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1621,11 +1621,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1641,44 +1641,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1689,27 +1689,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1717,16 +1717,16 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1739,7 +1739,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1750,53 +1750,53 @@ msgstr ""
 "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1805,12 +1805,12 @@ msgstr ""
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1818,7 +1818,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1826,11 +1826,11 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
@@ -1849,7 +1849,7 @@ msgstr "`%s' ist bereits komprimiert\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
@@ -1917,23 +1917,23 @@ msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2049,7 +2049,7 @@ msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2245,116 +2245,120 @@ msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:333
 #, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr "User-ID \"%s\" ist widerrufen.\n"
+msgid "User ID \"%s\" is revoked."
+msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Sind Sie sicher, da� Sie dies wiklich unterschreiben m�chten?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Wirklich unterschreiben? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr "  Beglaubigen ist nicht m�glich.\n"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
-"\n"
-"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
+
+#: g10/keyedit.c:386
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
-msgstr "\"%s\" wurde %sbereits durch Schl�ssel %08lX beglaubigt\n"
+msgid "\"%s\" was already signed by key %08lX\n"
+msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Sind Sie sicher, da� Sie dies immer noch unterschreiben wollen?\n"
-
-#: g10/keyedit.c:418
-msgid "Really sign? (y/N) "
-msgstr "Wirklich unterschreiben? (j/N) "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (j/N) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
+"werden\n"
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2364,27 +2368,27 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2392,7 +2396,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2400,7 +2404,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2408,7 +2412,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2416,7 +2420,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2424,7 +2428,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2432,29 +2436,33 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Wirklich unterschreiben? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2462,7 +2470,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2470,446 +2478,454 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
-msgstr "Schl�ssel wurde widerrufen.\n"
+#: g10/keyedit.c:1042
+msgid "Key is revoked."
+msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 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:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 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:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Dieser Schl�ssel k�nnte von %s key %s%s widerrufen worden sein\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
+"Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2918,15 +2934,15 @@ msgstr ""
 "         Ein hinzugef�gte Foto-ID k�nnte einige Versionen von PGP "
 "verwirren.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 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:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Sie k�nnen nur eine Foto-ID f�r diesen Schl�ssel haben.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2936,83 +2952,83 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3021,7 +3037,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, c-format
 msgid ""
 "\"\n"
@@ -3030,61 +3046,67 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+"Anzeigen einer %s Photo ID (%ld Byte) f�r Schl�ssel %08lX (User-ID %d)\n"
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
@@ -3102,7 +3124,7 @@ msgid "Keyring"
 msgstr "Schl�sselbund"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
@@ -3191,73 +3213,73 @@ msgstr ""
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3298,7 +3320,7 @@ msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -3514,46 +3536,52 @@ msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Ung�ltiges Mantra; versuchen Sie es bitte noch einmal"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+"Die mi�billigte 16-bit Pr�fsumme wird zum Schutz des geheimen Schl�ssels "
+"benutzt\n"
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunde j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunden j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "Hinweis: Signaturschl�ssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -3566,43 +3594,43 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -3617,12 +3645,12 @@ msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -3686,135 +3714,135 @@ msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "Schl�ssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdigen "
 "Schl�ssel - �bersprungen\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3933,6 +3961,10 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA ben�tigt einen 160-bit Hash Algorithmus\n"
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
@@ -3950,13 +3982,17 @@ msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr "Der \"Ownertrust\" wurde gel�scht\n"
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr ""
 "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel \"%s\"!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
@@ -4398,6 +4434,15 @@ msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Sind Sie sicher, da� Sie dies wiklich unterschreiben m�chten?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Sind Sie sicher, da� Sie dies immer noch unterschreiben wollen?\n"
+
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Wirklich unterschreiben? (j/N) "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 
diff --git a/po/el.po b/po/el.po
index 27ba288d2..082b4b7bd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-01-16 01:16+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "���"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "�����������"
 
@@ -273,7 +273,7 @@ msgstr "... ���� ����� bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -351,7 +351,7 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +359,170 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "���������� ����"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "���������� ���� ��� ���������� �������"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "������� ��� ����� ������������"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "�������� ��� ����� ������������"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "�������� ���� ��������� ����� ��������� ������������"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "��������-��������� ���� ������� � stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "��������-��������� ���� ������� � stdin"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,205 +532,205 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "���������"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "����� ��� gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "�������� �������� ��� ������"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|������� ����������� �� ���� �� ������"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "��������� ��� ���������� ��� ������������ ��� RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "����������� ���� ��� �������� ������,���������� ��� �������� �� OPENPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "����������� ���� ��� �������� ������,���������� ��� �������� �� OPENPGP"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|����� ��� ���������� ������ ������ N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|ONOMA|����� ��� ���������� ��������� ��������� ����� ��� ������� �������"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "�������� ��� ������ keyid ��� ���������������� �������"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|�����=����|����� ����� ��� ���������� ���������"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -738,7 +738,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -758,15 +758,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +776,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,257 +784,257 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������:�� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "� ���������� ��������� ������ �� ����� ������ %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "���������� ��������"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "� ������ ���������� ��� �������� ��������� ������ �� ����� ������ � "
 "underscore\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1042,11 +1042,11 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� �������������, ������� � "
 "underscores ��� ����� �� '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "�� ������� ��� ����� ��������� ������ �� ����� ������ ����������\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
@@ -1354,12 +1354,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
@@ -1381,7 +1381,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
@@ -1400,101 +1400,101 @@ msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "���������� ��������"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "������� ����-���������\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (�������� ��� �������������)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "� ����� ����� ��� ���������� �������������� - ������� �� ������������; "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1507,20 +1507,20 @@ msgstr ""
 "              �������������� ������� �������� ����� 1024 bits\n"
 "    ������� ������������ ������� �������� ����� 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "� DSA ��������� ���� ������� �������� ��� 512 ��� 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "�� ������� �������� ����� ���� �����, 1024 ����� � �������� ���� ��� RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 "�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
@@ -1534,14 +1534,14 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 "�� ������� �������� ����� ���� ������, %d ����� � ������� ���� ��� "
 "�����������.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1549,11 +1549,11 @@ msgstr ""
 "������ �������� ���������� ��� 2048 ��� ����������� �����\n"
 "�� ����������� ����� ����������!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "������� ������ ���� �� ������� ��������; "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1561,17 +1561,17 @@ msgstr ""
 "�������, ���� �� ����� ��'��� ��� � ����� ��� �� ������������ �����\n"
 "������ ���� ����� �� ���������!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1587,7 +1587,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1604,31 +1604,31 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "�� ������ ��� ����� ����\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "�� ������ ����� ���� %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1636,11 +1636,11 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1656,44 +1656,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1704,27 +1704,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1732,17 +1732,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1754,7 +1754,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1766,54 +1766,54 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "������������� ��� ������� �� ��� ������ �������� ������������:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1823,12 +1823,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1836,7 +1836,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1844,13 +1844,13 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "������� �� ������������; "
 
@@ -1869,7 +1869,7 @@ msgstr "%lu ������� ��������������\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: �������� ��������� ���: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -1933,21 +1933,21 @@ msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -2061,7 +2061,7 @@ msgstr "������ %08lX:  ��� ������ - ������������\n"
 msgid "no writable keyring found: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
@@ -2249,143 +2249,144 @@ msgstr "������ %08lX: ������������� ��������� ����������\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "������ %08lX: %d ���� ���������\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ���� �� ������� ��������; "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "������� �� ���������; "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "������� ������ ���� �� ������� ��������; "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "������� �� ���������; "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2393,61 +2394,65 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr "���� � �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr "���� � �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "������� �� ���������; "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2455,564 +2460,570 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "������� ������������� �������� N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "���������� ���������"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "�������� ��� ��������"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "�������� ���� user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "������ ��� ����������� �����"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "���������� ��������"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "���������� ��������"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "���������� ��������"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "���������� ��������"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "������> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "������� �� ������������� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����������: %s ����: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �� ������ ����������: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- ������� ������������ ��������\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �������� ���� ������ ���������: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ������ ���� �� ������� ��������; "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ������� ���������� ������ �� ������ %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3021,7 +3032,7 @@ msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3030,65 +3041,70 @@ msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s �������� ���: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s �������� ���: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
@@ -3107,7 +3123,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [�����: %s]"
@@ -3194,72 +3210,72 @@ msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "��������: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "��������: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�������� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                ������ �� \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -3302,7 +3318,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -3518,43 +3534,47 @@ msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "��� ������������� � ���������� ���������� %d\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "�� ������ ����� ������, ��������� ���� ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�������������: ����������� ������� ������ - ������� �� ����� ������\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "���� ��, ������������� ��� PGP, ������ ElGamal ��� ����� ������� ��� "
 "���������!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "�� ������� ������ ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�� ������� ������ ����� %lu ������������ ������� ��� ��� ��������\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "��������: �� ������ ��������� %08lX ����� ���� %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "������� ����� ��������� ���� �������� �������� bit\n"
 
@@ -3564,39 +3584,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s �������� ���: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "���������������� �������: %s\n"
@@ -3611,12 +3631,12 @@ msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
@@ -3680,134 +3700,134 @@ msgstr "%s: �������� ����������� hashtable: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: ������� lseek: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: ������� ������� �� recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: �� ������ ������ ������� %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "� trustdb ����� �������� - ��������������� �� \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ��� ����� ������ ����� keyID\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "������ %08lX: ������� ��� ������ �� �����������.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "������ %08lX: �������� ����������� ��� ���� trustdb\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "������ %08lX: ������ ������� ������ ��� �� ������ �� ����������� - "
 "���������\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "������� trust %lu, req ����� %d: read �������: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "������� trust %lu: delete �������: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync �������: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: ��� ����� trustdb ������\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb rec %lu: �������� lseek: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "��� ������� �� ������� ������"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3926,6 +3946,10 @@ msgstr ""
 "�������� �������� �������� �������� ��� ���������� ��������������, ������ "
 "��� %d �����!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
@@ -3943,12 +3967,16 @@ msgstr "���� ����� ��� ������� ������! - ������� �� ���������; "
 msgid "deleting keyblock failed: %s\n"
 msgstr "�������� keyblocks �������: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "������� ��� ������� ������ ��� ���� �� ������� ������!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
@@ -4334,6 +4362,18 @@ msgstr "���������� ��� ������ �������� ��� ���������"
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "������� ������ ���� �� ������� ��������; "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "������� ������ ���� �� ������� ��������; "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "������� �� ���������; "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "�������� ����������� ������� ������� bit; �� ���� ����� %d\n"
 
diff --git a/po/eo.po b/po/eo.po
index 9b1b53a76..46f7053a6 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-19 11:22+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"
@@ -29,27 +29,27 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 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"
 
-#: util/miscutil.c:294 util/miscutil.c:324
+#: util/miscutil.c:297 util/miscutil.c:327
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:295 util/miscutil.c:327
+#: util/miscutil.c:298 util/miscutil.c:330
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:296 util/miscutil.c:325
+#: util/miscutil.c:299 util/miscutil.c:328
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:297 util/miscutil.c:328
+#: util/miscutil.c:300 util/miscutil.c:331
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:329
+#: util/miscutil.c:332
 msgid "qQ"
 msgstr "fF"
 
@@ -272,7 +272,7 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -348,7 +348,7 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +356,163 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:280
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:281
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:282
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:283
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[dosieroj]|�ifri dosierojn"
 
-#: g10/g10.c:284
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:285
+#: g10/g10.c:289
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:286
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:287
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[dosieroj]|mal�ifri dosierojn"
 
-#: g10/g10.c:288
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:290
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:292
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:293
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:294
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:295
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:296
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:297
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:299
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:300
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:301
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:302
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/g10.c:303
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "subskribi �losilon loke kaj nerevokeble"
 
-#: g10/g10.c:304
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:305
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:306
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:307
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:308
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:310
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:312
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:316
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:318
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:320
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:322
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:324
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:326
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "senintervena aktualigo de fido-datenaro"
 
-#: g10/g10.c:327
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:328
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:330
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:332
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:336
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,196 +522,196 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:343
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:345
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:350
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:351
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:353
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:360
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:361
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:362
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:363
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:364
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:365
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "ne devigi v3-subskribojn"
 
-#: g10/g10.c:366
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "devigi v4-subskribojn"
 
-#: g10/g10.c:367
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "ne devigi v4-�losilsubskribojn"
 
-#: g10/g10.c:368
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:370
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "neniam uzi MDC por �ifrado"
 
-#: g10/g10.c:372
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "uzi gpg-agent"
 
-#: g10/g10.c:377
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:378
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:379
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:380
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:381
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:382
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/g10.c:383
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:384
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:386
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:387
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:391
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:393
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[dosiero]|skribi statusinformojn al dosiero"
 
-#: g10/g10.c:399
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi �i tiun �losilon absolute"
 
-#: g10/g10.c:400
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:401
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:403
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al PGP-2.x-konduto"
 
-#: g10/g10.c:407
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:409
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:411
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:412
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:413
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:414
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:415
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:416
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Montri Foto-Identigilojn"
 
-#: g10/g10.c:417
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Ne montri Foto-Identigilojn"
 
-#: g10/g10.c:418
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Agordi komandlinion por montri Foto-Identigilojn"
 
-#: g10/g10.c:419
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:422
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +719,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -739,15 +739,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:566
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -757,7 +757,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -765,233 +765,248 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:708
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1216
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1239 g10/g10.c:1255
+#, fuzzy, c-format
+msgid "WARNING: %s is a deprecated option.\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/g10.c:1241 g10/g10.c:1258
+#, c-format
+msgid "please use \"--keyserver-options %s\" instead\n"
+msgstr ""
+
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1445
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1460
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
 
-#: g10/g10.c:2263
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -999,83 +1014,83 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
 
-#: g10/g10.c:2277
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/armor.c:306
+#: g10/armor.c:314
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:335
+#: g10/armor.c:343
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:342
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:353
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:405
+#: g10/armor.c:413
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:529
+#: g10/armor.c:537
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:541
+#: g10/armor.c:549
 msgid "unexpected armor:"
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:667 g10/armor.c:1234
+#: g10/armor.c:675 g10/armor.c:1242
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:718
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:752
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:756
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:752 g10/armor.c:1271
+#: g10/armor.c:760 g10/armor.c:1279
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:772
+#: g10/armor.c:780
 msgid "premature eof (in Trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:776
+#: g10/armor.c:784
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1049
+#: g10/armor.c:1057
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1054
+#: g10/armor.c:1062
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1058
+#: g10/armor.c:1066
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1111,11 +1126,11 @@ msgid "Revocation comment: "
 msgstr "Komento pri revoko: "
 
 #. a string with valid answers
-#: g10/pkclist.c:244
+#: g10/pkclist.c:252
 msgid "iImMqQsS"
 msgstr "iImMfFsS"
 
-#: g10/pkclist.c:250
+#: g10/pkclist.c:258
 #, c-format
 msgid ""
 "No trust value assigned to:\n"
@@ -1124,7 +1139,7 @@ msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:262
+#: g10/pkclist.c:270
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1136,90 +1151,91 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/pkclist.c:265
+#: g10/pkclist.c:273
 #, c-format
 msgid " %d = Don't know\n"
 msgstr " %d = Ne scias\n"
 
-#: g10/pkclist.c:266
+#: g10/pkclist.c:274
 #, c-format
 msgid " %d = I do NOT trust\n"
 msgstr " %d = Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:267
+#: g10/pkclist.c:275
 #, c-format
 msgid " %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/pkclist.c:268
+#: g10/pkclist.c:276
 #, c-format
 msgid " %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:278
 #, c-format
 msgid " %d = I trust ultimately\n"
 msgstr " %d = Mi fidas absolute\n"
 
-#: g10/pkclist.c:271
+#: g10/pkclist.c:279
 msgid " i = please show me more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/pkclist.c:273
+#: g10/pkclist.c:281
 msgid " m = back to the main menu\n"
 msgstr " m = reen al la �efmenuo\n"
 
-#: g10/pkclist.c:276
+#: g10/pkclist.c:284
 msgid " s = skip this key\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: g10/pkclist.c:277
+#: g10/pkclist.c:285
 msgid " q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:284
+#: g10/pkclist.c:292
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:305
+#: g10/pkclist.c:313
 msgid "Do you really want to set this key to ultimate trust? "
 msgstr "�u vi vere volas �an�i �i tiun �losilon al absoluta fido? "
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:325
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/pkclist.c:391
+#: g10/pkclist.c:399
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: g10/pkclist.c:398 g10/pkclist.c:410 g10/pkclist.c:504
+#: g10/pkclist.c:406 g10/pkclist.c:418 g10/pkclist.c:512
 msgid "Use this key anyway? "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/pkclist.c:403
+#: g10/pkclist.c:411
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "�losilo %08lX: sub�losilo estas revokita!\n"
 
-#: g10/pkclist.c:424
+#: g10/pkclist.c:432
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: �losilo eksvalidi�is\n"
 
-#: g10/pkclist.c:434
+#: g10/pkclist.c:442
 #, c-format
 msgid ""
 "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
+msgstr ""
+"%08lX: Estas nenia indiko, ke �i tiu �losilo vere apartenas al la posedanto\n"
 
-#: g10/pkclist.c:440
+#: g10/pkclist.c:448
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Ni NE fidas �i tiun �losilon\n"
 
-#: g10/pkclist.c:446
+#: g10/pkclist.c:454
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1228,15 +1244,15 @@ msgstr ""
 "%08lX: Ne estas certe, ke �i tiu �losilo vere apartenas al la posedanto,\n"
 "sed �i tamen estas akceptita\n"
 
-#: g10/pkclist.c:452
+#: g10/pkclist.c:460
 msgid "This key probably belongs to the owner\n"
 msgstr "�i tiu �losilo ver�ajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:465
 msgid "This key belongs to us\n"
 msgstr "�i tiu �losilo apartenas al ni\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:507
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1248,192 +1264,195 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:513 g10/pkclist.c:535
+#: g10/pkclist.c:521 g10/pkclist.c:543
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:554
+#: g10/pkclist.c:562
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:555
+#: g10/pkclist.c:563
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:561
+#: g10/pkclist.c:569
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:566
+#: g10/pkclist.c:574
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:571
+#: g10/pkclist.c:579
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:582
+#: g10/pkclist.c:590
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:592
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:592
+#: g10/pkclist.c:600
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:601
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:601
+#: g10/pkclist.c:609
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:603
+#: g10/pkclist.c:611
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:706 g10/pkclist.c:729 g10/pkclist.c:866 g10/pkclist.c:921
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:715 g10/pkclist.c:895
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:744
+#: g10/pkclist.c:752
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:754
+#: g10/pkclist.c:762
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
-msgstr "\nDonu la uzantidentigilon. Finu per malplena linio: "
+msgstr ""
+"\n"
+"Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:768
+#: g10/pkclist.c:776
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:773
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:799
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:798
+#: g10/pkclist.c:806
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:841
+#: g10/pkclist.c:849
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:877
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:927
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "prefero %c%lu ne estas valida\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "prefero %c%lu ripetita\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:430
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:484 g10/keygen.c:568 g10/keygen.c:659
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:489 g10/keygen.c:573 g10/keygen.c:664
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:764
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:766
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:769
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:773
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:796
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Uzado de �i tiu algoritmo estas malrekomendata - �u tamen krei? "
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:823
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1446,19 +1465,19 @@ msgstr ""
 "               implicita �losilgrando estas 1024 bitoj\n"
 " plej granda rekomendata �losilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:832
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:837
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:839
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
-#: g10/keygen.c:842
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
@@ -1470,12 +1489,12 @@ msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:853
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1483,11 +1502,11 @@ msgstr ""
 "�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "�ar la komputado da�ras TRE longe!\n"
 
-#: g10/keygen.c:861
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keygen.c:862
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1495,21 +1514,17 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1525,7 +1540,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1541,30 +1556,30 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1572,11 +1587,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1591,44 +1606,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1639,27 +1654,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon a� la komenton\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (F)ini? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�an�u (N)omon, (K)omenton, (A)adreson, a� (B)one/(F)ini? "
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1667,16 +1682,16 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1688,7 +1703,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1700,53 +1715,53 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1754,12 +1769,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1767,7 +1782,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1775,11 +1790,11 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTO: krei sub�losilojn por v3-�losiloj ne estas OpenPGP-kongrue\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "�u vere krei? "
 
@@ -1798,7 +1813,7 @@ msgstr "'%s' jam densigita\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:955
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -1827,32 +1842,32 @@ msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1862,21 +1877,21 @@ msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:186 g10/getkey.c:2234
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+#: g10/getkey.c:1360
+#, fuzzy, c-format
+msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:1957
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:1998
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -1956,173 +1971,178 @@ msgstr "sekretaj �losiloj importitaj: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:438 g10/import.c:641
+#: g10/import.c:438 g10/import.c:654
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:452
+#: g10/import.c:455
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
+
+#: g10/import.c:462
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:454
+#: g10/import.c:464
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:465 g10/import.c:710
+#: g10/import.c:475 g10/import.c:723
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:470
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:480
+#: g10/import.c:490
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:485 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:488 g10/import.c:559 g10/import.c:661 g10/import.c:770
+#: g10/import.c:498 g10/import.c:569 g10/import.c:674 g10/import.c:783
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:493
+#: g10/import.c:503
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:512
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:530 g10/import.c:727
+#: g10/import.c:540 g10/import.c:740
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:537 g10/import.c:733
+#: g10/import.c:547 g10/import.c:746
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:564
+#: g10/import.c:574
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:567
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:570
+#: g10/import.c:580
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:573
+#: g10/import.c:583
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:576
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:579
+#: g10/import.c:589
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:589
+#: g10/import.c:599
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:655
+#: g10/import.c:668
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:666
+#: g10/import.c:679
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
 #. we can't merge secret keys
-#: g10/import.c:670
+#: g10/import.c:683
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:675
+#: g10/import.c:688
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:704
+#: g10/import.c:717
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:744
+#: g10/import.c:757
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:775
+#: g10/import.c:788
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:810
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:817 g10/import.c:841
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:836
+#, fuzzy, c-format
+msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:818
-#, c-format
-msgid "key %08lX: invalid self-signature\n"
+#: g10/import.c:838
+#, fuzzy, c-format
+msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:833
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:842
+#: g10/import.c:865
 #, c-format
-msgid "key %08lX: invalid subkey binding\n"
-msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:869
+#: g10/import.c:866
 #, c-format
-msgid "key %08lX: accepted non self-signed user ID '"
-msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:897
+#: g10/import.c:896
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:920
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -2131,143 +2151,168 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:943
+#: g10/import.c:942
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:952
+#: g10/import.c:951
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:969
+#: g10/import.c:968
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1070
+#: g10/import.c:1069
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1128
+#, c-format
+msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr ""
+
+#: g10/import.c:1142
+#, c-format
+msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr ""
+
+#: g10/import.c:1198
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1152
+#: g10/import.c:1228
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:1266 g10/import.c:1319
-#, c-format
-msgid "key %08lX: our copy has no self-signature\n"
-msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
-
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
-msgid "Are you sure you still want to sign it?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, 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:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
-msgid "Really sign? "
-msgstr "�u vere subskribi? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Via aktuala subskribo sur \"%s\"\n"
+"estas loka subskribo.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"�u vi volas igi �in plena eksportebla subskribo?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Via aktuala subskribo sur \"%s\"\n"
 "estas loka subskribo.\n"
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:386
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
+msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
+
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:406
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  �u vi estas certa, ke vi ankora� volas subskribi �in?\n"
-
-#: g10/keyedit.c:420
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:422
-msgid "Do you want your signature to expire at the same time? (y/n) "
+#: g10/keyedit.c:440
+#, fuzzy
+msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2276,27 +2321,27 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2304,59 +2349,73 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
-msgstr "\nLa subskribo estos markita kiel neeksportebla.\n"
+msgstr ""
+"\n"
+"La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
-msgstr "\nLa subskribo estos markita kiel nerevokebla.\n"
+msgstr ""
+"\n"
+"La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
-msgstr "\nMi tute ne kontrolis �i tiun �losilon.\n"
+msgstr ""
+"\n"
+"Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
-msgstr "\nMi malzorge kontrolis �i tiun �losilon.\n"
+msgstr ""
+"\n"
+"Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
-msgstr "\nMi tre zorge kontrolis �i tiun �losilon.\n"
+msgstr ""
+"\n"
+"Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "�u vere subskribi? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2364,7 +2423,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2372,445 +2431,452 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsub"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "subskribi la �losilon nerevokeble"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsub"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la �losilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "alfoto"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "forfoto"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "�efa"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "monpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "agpref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "aktpref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "monfoto"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:908
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1000
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1087
 #, 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:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2818,15 +2884,16 @@ msgstr ""
 "AVERTO: �i tiu �losilo jam havas foto-identigilon.\n"
 "        Aldono de alia foto-identigilo eble konfuzos iujn versiojn de PGP.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
-msgid "Are you sure you still want to add it? (y/n) "
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
+#, 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:1601
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Eblas havi nur unu foto-identigilon sur �losilo.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2835,83 +2902,83 @@ 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:1626
+#: g10/keyedit.c:1688
 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:1757
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1932
 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:1912
+#: g10/keyedit.c:1974
 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:1928
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -2920,48 +2987,78 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2335
-msgid "Create a revocation certificate for this signature? (y/N)"
+#: g10/keyedit.c:2428
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"subskribita per via �losilo %08lX je %s\n"
+
+#: g10/keyedit.c:2433
+#, fuzzy, c-format
+msgid "This signature expired on %s.\n"
+msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
+
+#: g10/keyedit.c:2437
+#, 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:2441
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:2373
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:2481
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2519
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   subskribita per %08lX je %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   subskribita per %08lX je %s%s\n"
+
+#: g10/keyedit.c:2521
+msgid " (non-exportable)"
+msgstr ""
 
-#: g10/keyedit.c:2418
-msgid "Really create the revocation certificates? (y/N)"
+#: g10/keyedit.c:2528
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
@@ -2979,7 +3076,7 @@ msgid "Keyring"
 msgstr "�losilaro"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
@@ -3065,71 +3162,71 @@ msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1291 g10/mainproc.c:1314
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1292 g10/mainproc.c:1315
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1318
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1338
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1398
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1467 g10/mainproc.c:1483 g10/mainproc.c:1545
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1494
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1551
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1558
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -3163,14 +3260,15 @@ msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 #: g10/misc.c:436
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
+msgstr ""
+"bonvolu vidi http://www.gnupg.org/why-not-idea.html por pliaj informoj\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -3365,12 +3463,12 @@ msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/hkp.c:467
+#: g10/hkp.c:472
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/hkp.c:517
+#: g10/hkp.c:522
 #, c-format
 msgid "can't search keyserver: %s\n"
 msgstr "ne povas ser�i �e �losilservilo: %s\n"
@@ -3384,43 +3482,47 @@ msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Nevalida pasfrazo; bonvolu provi denove"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�i tio estas PGP-kreita ElGamal-�losilo, kiu NE estas sekura por "
 "subskribado!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
@@ -3428,41 +3530,44 @@ msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen kompletigo.\n"
+msgstr ""
+"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
+"kompletigo.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only 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:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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"
+msgstr ""
+"eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:949
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -3477,12 +3582,12 @@ msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -3511,7 +3616,7 @@ msgstr "%s: ne povas krei �loson\n"
 msgid "%s: can't make lock\n"
 msgstr "%s: ne povas krei �loson\n"
 
-#: g10/keyring.c:1433 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
+#: g10/keyring.c:1436 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
@@ -3546,133 +3651,134 @@ msgstr "%s: malsukcesis krei haktabelon: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "�losilo %08lX aperas pli ol unufoje en la fido-datenaro\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "fido-registro %lu ne havas petitan specon %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "kontrolas �e profundo %d subskribita=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"kontrolas �e profundo %d subskribita=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3786,6 +3892,10 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
@@ -3803,12 +3913,16 @@ msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
@@ -4078,10 +4192,11 @@ msgstr ""
 "havebla."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 "�an�i la preferojn de �iuj uzantidentigiloj (a� nur la elektitaj)\n"
 "al la aktuala listo de preferoj. La dato de �iuj trafitaj\n"
@@ -4179,44 +4294,56 @@ msgstr "�losilaro '%s' kreita\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyring.c:1232
+#: g10/keyring.c:1235
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1234
+#: g10/keyring.c:1237
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1235
+#: g10/keyring.c:1238
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1236
+#: g10/keyring.c:1239
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1334
+#: g10/keyring.c:1337
 #, c-format
 msgid "checking keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1365
+#: g10/keyring.c:1368
 #, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
 msgstr "%lu �losiloj jam kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1376
+#: g10/keyring.c:1379
 #, c-format
 msgid "%lu keys checked (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1438
+#: g10/keyring.c:1441
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
+
+#~ msgid "key %08lX: our copy has no self-signature\n"
+#~ msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  �u vi estas certa, ke vi ankora� volas subskribi �in?\n"
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   subskribita per %08lX je %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key uzantidentigilo"
 
diff --git a/po/es.po b/po/es.po
index 46bf9832b..07fe8e82b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2001-10-22 00:13+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "salir"
 
@@ -303,7 +303,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado un error... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -390,7 +390,7 @@ msgstr ""
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -398,170 +398,170 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "elimina la clave del anillo privado"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o de la entrada est�ndar"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o a la entrada est�ndar"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -571,90 +571,90 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 # usa
 # Vale.
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "usa el agente gpg"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -664,114 +664,114 @@ msgstr "proceso por lotes: nunca preguntar"
 # Adem�s una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "s�" en casi todas las
 # preguntas no me acaba de gustar.
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo OpenPGP"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE para las contrase�as"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
@@ -779,7 +779,7 @@ msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -787,7 +787,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -807,15 +807,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -825,7 +825,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -833,236 +833,236 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "muestra preferencias"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1070,22 +1070,22 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "El primer car�cter de una notaci�n debe ser una letra o un subrayado\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1093,11 +1093,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
@@ -1403,12 +1403,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
@@ -1430,7 +1430,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
@@ -1448,100 +1448,100 @@ msgstr "%s: omitida: clave p�blica ya presente\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "Demasiadas preferencias"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firmar y cifrar)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "El uso de este algoritmo est� desaconsejado - �crear de todas formas?"
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1554,19 +1554,19 @@ msgstr ""
 "        el tama�o por defecto es 1024 bits\n"
 " el tama�o m�ximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
@@ -1578,12 +1578,12 @@ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1591,11 +1591,11 @@ msgstr ""
 "No se recomiendan claves de m�s de 2048 bits porque\n"
 "�el tiempo de c�lculo es REALMENTE largo!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1603,17 +1603,17 @@ msgstr ""
 "De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
 "teclado tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1629,7 +1629,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1646,31 +1646,31 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1678,11 +1678,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas m�s all� del 2038.\n"
 "Sin embargo funcionar� correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1698,44 +1698,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1746,29 +1746,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor no ponga la direcci�n de correo-e en el nombre realo en el "
 "comentario\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (S)alir? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1776,17 +1776,17 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1798,7 +1798,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1811,54 +1811,54 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no puede bloquearse el anillo secreto: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1866,12 +1866,12 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
 "la orden \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1879,7 +1879,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1887,11 +1887,11 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaves para claves V3 no sigue el est�ndar OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
@@ -1910,7 +1910,7 @@ msgstr "se han procesado %lu claves\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: no se puede abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
@@ -1974,21 +1974,21 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
@@ -2102,7 +2102,7 @@ msgstr "clave %08lX: clave nueva - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "no puede escribirse el anillo: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -2289,143 +2289,144 @@ msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "�Firmar de verdad? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "�Seguro que quiere una clave de este tama�o? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "�Firmar de verdad? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2433,7 +2434,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2442,7 +2443,7 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2451,47 +2452,51 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "�Firmar de verdad? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2499,7 +2504,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2507,558 +2512,564 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "firma"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "a�aidu"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "a�acla"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario para firmar\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s expira: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontr� una revocaci�n falsificada\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, 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:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3067,7 +3078,7 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3076,65 +3087,70 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave (s/N)?"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "firma %s de: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
@@ -3153,7 +3169,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca el %s]"
@@ -3240,72 +3256,72 @@ msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -3348,7 +3364,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -3563,43 +3579,47 @@ msgstr "las partes de la clave privada no est�n disponibles\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "el algoritmo de protecci�n %d no puede ser utilizado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCI�N: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
 
@@ -3609,39 +3629,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descifrado fallido: %s\n"
@@ -3656,12 +3676,12 @@ msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3726,134 +3746,134 @@ msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d inv�lida\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificador largo de clave v�lido\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "clave %08lX: aceptada como clave de confianza.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "clave %08lX: clave fiable sin clave p�blica - omitida\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confianza %lu: fallo al borrar: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inserci�n del registro de confianza fallida: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "cambia valores de confianza"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "Clave p�blica no encontrada"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3968,6 +3988,10 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
@@ -3985,12 +4009,16 @@ msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumeraci�n de bloques de clave fallida: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hay una clave secreta para esta clave p�blica!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
@@ -4363,6 +4391,18 @@ msgstr "lista claves y firmas"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "�Seguro que quiere una clave de este tama�o? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "�Seguro que quiere una clave de este tama�o? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "�Firmar de verdad? "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "se solicitan demasiados bits aleatorios; el l�mite es %d\n"
 
diff --git a/po/et.po b/po/et.po
index 8be7f069d..00dcf401d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-03-08 11:47+0200\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "v�lju"
 
@@ -272,7 +272,7 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -348,7 +348,7 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -356,163 +356,163 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[failid]|kr�pteeri failid"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "ainult salvesta"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[failid]|dekr�pteeri failid"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "allkirjasta v�ti mitte-t�histatavana"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "n�ita ainult pakettide j�rjendeid"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse v��rtused"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend lahti"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -522,196 +522,196 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "�ra kasuta v3 allkirju"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "kasuta v4 v�tme allkirju"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "�ra kasuta v3 v�tme allkirju"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "kr�ptimisel �ra kasuta kunagi MDC"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "loe v�tmed failist"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "kasuta k�ikide pakettide, �iffrite ja l�hendi seadeid PGP 2.x moodis"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Sea k�surida foto ID vaatamiseks"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -719,7 +719,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -739,15 +739,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -757,7 +757,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -765,249 +765,249 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "vigased eelistused\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatel�hendi algoritm `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1015,12 +1015,12 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
@@ -1316,12 +1316,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -1342,7 +1342,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
@@ -1359,99 +1359,100 @@ msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "eelistus %c%lu ei ole lubatud\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "lubamatu s�mbol s�nes\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1464,19 +1465,19 @@ msgstr ""
 "            vaikimisi v�tmepikkus on 1024 bitti\n"
 "    suurim soovitatav v�tmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 
@@ -1488,12 +1489,12 @@ msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1501,11 +1502,11 @@ msgstr ""
 "Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused v�tavad V�GA palju aega!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1513,17 +1514,17 @@ msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1539,7 +1540,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1555,30 +1556,30 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1586,11 +1587,11 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1605,44 +1606,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1653,27 +1654,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1681,16 +1682,16 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1702,7 +1703,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1714,53 +1715,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1769,28 +1770,28 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
@@ -1809,7 +1810,7 @@ msgstr "`%s' on juba pakitud\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: ei �nnestu avada: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -1874,22 +1875,22 @@ msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --always-trust kasutamisega\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -2003,7 +2004,7 @@ msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
@@ -2189,118 +2190,128 @@ msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Olete kindel, et soovite seda ikka allkirjastada?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Olete kindel, et soovite seda ikka lisada? (j/e) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Allkirjastan t�esti? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Teie praegune allkiri \"%s\"\n"
+"on lokaalne allkiri.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 "\n"
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" on juba %sallkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on juba %sallkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Olete kindel, et soovite seda ikkagi allkirjastada?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Allkirjastan t�esti? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Soovite et teie allkiri aeguks samal ajal? (j/e) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "PGP 2.x stiilis v�tmetega saab allkirjastada ainult --pgp2 moodis\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2310,27 +2321,27 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2338,7 +2349,7 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2346,7 +2357,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2354,7 +2365,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2362,7 +2373,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2370,7 +2381,7 @@ msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2378,29 +2389,33 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Allkirjastan t�esti? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2408,7 +2423,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2416,445 +2431,452 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "l�lita"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "n�ita foto ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "V�ti on t�histatud.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti %s%s\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2863,16 +2885,16 @@ msgstr ""
 "         J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
 "         versiooni kasutamisel.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 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:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2881,83 +2903,83 @@ 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:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -2966,7 +2988,7 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -2975,64 +2997,69 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/e) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
@@ -3050,7 +3077,7 @@ msgid "Keyring"
 msgstr "V�tmehoidla"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
@@ -3136,71 +3163,71 @@ msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Noteering: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Poliis: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -3242,7 +3269,7 @@ msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -3456,41 +3483,45 @@ msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Vigane parool; palun proovige uuesti"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "avalik v�ti on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
 
@@ -3502,40 +3533,40 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s allkiri kasutajalt: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "PGP 2.x stiilis v�tmetega saab allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -3550,12 +3581,12 @@ msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3619,130 +3650,130 @@ msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3858,6 +3889,10 @@ msgstr ""
 "s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
 "d korda!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda v�tmeta teha \"--yes\"\n"
@@ -3875,12 +3910,16 @@ msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
@@ -4287,6 +4326,16 @@ msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Olete kindel, et soovite seda ikka allkirjastada?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Olete kindel, et soovite seda ikkagi allkirjastada?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Allkirjastan t�esti? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "v�ti %08lX: meie koopial puudub iseenda allkiri\n"
 
diff --git a/po/fr.po b/po/fr.po
index e673d8e44..e7dab56f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-03-28 23:43+01:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -52,7 +52,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "quitter"
 
@@ -279,7 +279,7 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -358,7 +358,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -366,163 +366,163 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "[fichier]|chiffrer les fichiers"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[fichiers]|d�chiffrer les fichiers"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "signer une cl� irr�vocablement"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "signer une cl� localement et irr�vocablement"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "mise � jour inattendue de la base de confiance"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,203 +532,203 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "ne pas forcer les signatures en v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "forcer les signatures en v4"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "ne pas forcer les signatures en v4"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr ""
 "ne jamais utiliser de sceau pour le\n"
 "chiffrement"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "indiquer o� est une cl� list�e"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCL�|donner une confiance ultime � cette cl�"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "utiliser le comportement de PGP 2.x\n"
 "pour toutes les options de paquets,\n"
 "de hachage et de chiffrement"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identit�"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identit�"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant �\n"
 "afficher les photos d'identit�"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +736,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,17 +756,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +776,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,255 +784,255 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "ce message ne sera pas forc�ment utilisable par PGP 2.x\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level invalide; ce doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "pr�f�rences invalides\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1041,13 +1041,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent �tre entour�s d'autes "
 "caract�res\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
@@ -1346,12 +1346,12 @@ msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
@@ -1375,7 +1375,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le r�cipient par d�faut\n"
 
@@ -1392,103 +1392,104 @@ msgstr "ignor�: cl� publique d�j� activ�e\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "la pr�f�rence %c%lu n'est pas valide\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "pr�f�rence %c%lu dupliqu�e\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "trop de pr�f�rences `%c'\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "Caract�re invalide dans la cha�ne\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "L'utilisation de cet algorithme est d�conseill� - faut-il quand-m�me\n"
 "cr�er la cl� ?"
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1501,19 +1502,19 @@ msgstr ""
 "          la taille par d�faut est 1024 bits\n"
 " la taille maximale conseill�e est 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
@@ -1525,12 +1526,12 @@ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1538,11 +1539,11 @@ msgstr ""
 "Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1550,17 +1551,17 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
 "clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1576,7 +1577,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1592,30 +1593,30 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1623,11 +1624,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1643,44 +1644,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1691,28 +1692,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom r�el ou dans le commentaire\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1720,16 +1721,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1741,7 +1742,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1753,55 +1754,55 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1810,13 +1811,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou�: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1824,7 +1825,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1832,12 +1833,12 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
@@ -1856,7 +1857,7 @@ msgstr "`%s' d�j� compress�\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
@@ -1924,23 +1925,23 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "La cl� invalide %08lX a �t� rendu valide par --always-trust\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -2054,7 +2055,7 @@ msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -2241,118 +2242,130 @@ msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 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:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "�tes-vous s�r de vouloir le signer ?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Signer r�ellement ? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Votre signature actuelle sur \"%s\"\n"
+"est locale.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Voulez vous la rendre compl�tement exportable ?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Votre signature actuelle sur \"%s\"\n"
 "est locale.\n"
 "\n"
 "Voulez vous la rendre compl�tement exportable ?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� %ssign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� %ssign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr " �tes-vous s�r de vouloir la signer ?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Signer r�ellement ? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (o/n) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"il n'est possible de signer avec des cl�s de style PGP 2.x uniquement\n"
+"en mode --pgp2\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "ce message ne sera pas forc�ment utilisable par PGP 2.x\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2362,27 +2375,27 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2390,7 +2403,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2398,7 +2411,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2406,7 +2419,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2414,7 +2427,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2422,7 +2435,7 @@ msgstr ""
 "\n"
 "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2430,35 +2443,39 @@ msgstr ""
 "\n"
 "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Signer r�ellement ? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2467,446 +2484,453 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "signer la cl� de fa�on non-r�vocable"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "signer la cl� de fa�on locale et non-r�vocable"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "montr.pr�f"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "mettre.pr�f"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "donner la liste de pr�f�rences"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "pr�f.m�j"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "pr�f�rences mises � jour"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, 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:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 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:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s%s\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  cr��e: %s expire: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2915,16 +2939,16 @@ msgstr ""
 "           Ajouter une autre photo d'identit� peut poser des\n"
 "           probl�mes avec certaines versions de PGP.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Vous ne pouvez avoir qu'une seule photo d'identit� par cl�.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2934,84 +2958,84 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3020,7 +3044,7 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3029,64 +3053,69 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   sign� par %08lX � %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   sign� par %08lX � %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
@@ -3104,7 +3133,7 @@ msgid "Keyring"
 msgstr "Porte-cl�s"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
@@ -3192,71 +3221,71 @@ msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Signature expir�e de \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -3300,7 +3329,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -3522,42 +3551,46 @@ msgstr "les parties secr�tes ne sont pas disponibles\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Mot de passe invalide ; r�essayez"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: la cl� de signature %08lX a expir� le %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
@@ -3571,43 +3604,43 @@ msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de signer avec des cl�s de style PGP 2.x uniquement\n"
 "en mode --pgp2\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -3622,12 +3655,12 @@ msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3692,134 +3725,134 @@ msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "cl� %08lX: accept�e comme cl� de confiance.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "la cl� %08lX appara�t plusieurs fois dans la base de confiance\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "cl� %08lX: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: %"
 "s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "cl� publique %08lX non trouv�e : %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3942,6 +3975,10 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
@@ -3959,12 +3996,16 @@ msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
@@ -4376,6 +4417,16 @@ msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "�tes-vous s�r de vouloir le signer ?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr " �tes-vous s�r de vouloir la signer ?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Signer r�ellement ? "
+
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Avez-vous r�ellement besoin d'une taille aussi grande ? "
 
diff --git a/po/gl.po b/po/gl.po
index 6c6606270..8e78a8d84 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2001-07-11 18:17+0200\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "abandonar"
 
@@ -273,7 +273,7 @@ msgstr "... isto � un erro (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "atopou un erro ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -351,7 +351,7 @@ msgstr ""
 "traballo para lle dar ao sistema operativo unha oportunidade de acumular\n"
 "m�is entrop�a (Prec�sanse %d bytes m�is)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +359,170 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "s� armacenar"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "borrar unha chave do chaveiro p�blico"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "borrar unha chave do chaveiro secreto"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "listar s� a secuencia de paquetes"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exporta-los valores de confianza no propietario"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "ama�ar unha base de datos de confianza corrompida"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Quita-la armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "P�r armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,206 +532,206 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "emprega-lo gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "le-las opci�ns dun ficheiro"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCHAVE|confiar absolutamente nesta chave"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emula-lo modo descrito no RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento "
 "OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "axustar t�dalas opci�ns de paquetes, cifrado e resumo ao comportamento "
 "OpenPGP"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes datos de notaci�n"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -739,7 +739,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -759,17 +759,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -779,7 +779,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -787,256 +787,256 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa dado non � v�lido\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa dado non � v�lido\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compresi�n debe estar entre %d e %d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "amosar preferencias"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro car�cter dun nome de notaci�n debe ser unha letra ou gui�n baixo\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1044,12 +1044,12 @@ msgstr ""
 "un nome de notaci�n s� debe ter letras, d�xitos, puntos ou gui�ns baixos e "
 "rematar con '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "os puntos dun nome de notaci�n deben estar rodeados por outros caracteres\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
@@ -1356,12 +1356,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
@@ -1383,7 +1383,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
@@ -1402,100 +1402,100 @@ msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "amosar preferencias"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (asinar e cifrar)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Este algoritmo est� obsoleto - �crear de t�dolos xeitos? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1508,19 +1508,19 @@ msgstr ""
 "        tama�o de chave por defecto: 1024 bits\n"
 " tama�o de chave m�ximo recomendado: 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s� admite tama�os entre 512 e 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 
@@ -1532,12 +1532,12 @@ msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "chave grande de m�is; %d � o maior tama�o admitido.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1545,11 +1545,11 @@ msgstr ""
 "�As chaves maiores de 2048 bits non se aconsellan porque\n"
 "os c�lculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "�Est� seguro de que quere este tama�o de chave? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1557,17 +1557,17 @@ msgstr ""
 "De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado tam�n "
 "son vulnerables a ataques!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1583,7 +1583,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1600,31 +1600,31 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave non caduca nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave caduca o %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1632,11 +1632,11 @@ msgstr ""
 "O seu sistema non pode amosar datas m�is al� do 2038.\n"
 "A�nda as�, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1652,44 +1652,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1700,28 +1700,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non po�a o enderezo de correo no nome real ou no comentario\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia-lo (N)ome, (C)omentario, (E)-mail ou (S)a�r? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambiar (N)ome, (C)omentario, (E)-mail ou (A)ceptar/(S)a�r? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1729,17 +1729,17 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1751,7 +1751,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1763,54 +1763,54 @@ msgstr ""
 "mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
 "n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "cre�ronse e asin�ronse as chaves p�blica e secreta.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que conducen a unha chave de confianza absoluta:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1819,12 +1819,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1832,7 +1832,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1840,11 +1840,11 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a creaci�n de subchaves para chaves v3 non cumpre OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "�Crear realmente? "
 
@@ -1863,7 +1863,7 @@ msgstr "%lu chaves procesadas\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: non se pode abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -1927,21 +1927,21 @@ msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - ignorada\n"
@@ -2055,7 +2055,7 @@ msgstr "chave %08lX: nova chave - omitida\n"
 msgid "no writable keyring found: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
@@ -2252,143 +2252,144 @@ msgstr "chave %08lX: certificado de revocaci�n engadido\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas sinaturas\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[sinatura propia]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin sinatura propia v�lida\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin sinatura propia v�lida\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere este tama�o de chave? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "�Asinar de verdade? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Xa foi asinado pola chave %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Xa foi asinado pola chave %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "�Est� seguro de que quere este tama�o de chave? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "�Asinar de verdade? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2396,7 +2397,7 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2405,7 +2406,7 @@ msgstr ""
 "A sinatura ser� marcada como non exportable.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2414,47 +2415,51 @@ msgstr ""
 "A sinatura ser� marcada como non exportable.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "�Asinar de verdade? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2462,7 +2467,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2470,558 +2475,564 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "asinar"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "sinatura-la chave"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "asinar"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sinatura-la chave localmente"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "amosar preferencias"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (y/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "Creouse %s%c %4u%c/%08lX : %s caduca: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocaci�n falsa\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere este tama�o de chave? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (y/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (y/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (y/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta sinatura propia? (y/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3030,7 +3041,7 @@ msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3039,65 +3050,70 @@ msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Firmou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "asinado por %08lX no %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "asinado por %08lX no %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (y/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
@@ -3116,7 +3132,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
@@ -3203,72 +3219,72 @@ msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Normativa: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Sinatura feita por %.*s usando %s de ID de chave %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "               aka \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -3311,7 +3327,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -3526,44 +3542,48 @@ msgstr "hai partes da chave secreta non dispo�ibles\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "o algoritmo de protecci�n %d non est� soportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Contrasinal non v�lido; por favor, t�nteo de novo ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Detectouse unha chave feble - por favor, cambie o contrasinal outra "
 "vez.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�esta � unha chave ElGamal xerada por PGP que non � segura para sinaturas!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos m�is nova c� sinatura\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: a chave de sinatura %08lX caducou o %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "asumindo unha sinatura incorrecta debido a un bit cr�tico desco�ecido\n"
@@ -3574,39 +3594,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Sinatura %s de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "o descifrado fallou: %s\n"
@@ -3621,12 +3641,12 @@ msgstr "non � posible manexar li�as de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3691,135 +3711,135 @@ msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versi�n: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versi�n con n�mero de rexistro %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido p�r a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' non � un ID longo de chave v�lido\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "chave %08lX: aceptada como chave de confianza.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "chave %08lX: non se pode p�r na base de datos de confianza\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: non hai unha chave p�blica para a chave de confianza - omitida\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo da petici�n %d: fallou a lectura: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "rexistro de confianza %lu: fallou o borrado: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: non � un ficheiro de base de datos de confianza\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "non se atopou a chave p�blica"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3937,6 +3957,10 @@ msgstr ""
 "non se pode evitar unha chave feble para o cifrado sim�trico; tentouse %d "
 "veces\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
@@ -3955,12 +3979,16 @@ msgstr "�Esta � unha chave secreta! - �est� seguro de que quere borrala? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "erro � enumera-los bloques de chaves: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "�hai unha chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-key\" para borrala primeiro.\n"
@@ -4333,6 +4361,18 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "�Est� seguro de que quere este tama�o de chave? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "�Est� seguro de que quere este tama�o de chave? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "�Asinar de verdade? "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "ped�ronse demasiados bits aleatorios; o l�mite � %d\n"
 
diff --git a/po/id.po b/po/id.po
index 3ccf4a152..b3612d92e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUPG 1.0.7\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-03-05 07:33GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "keluar"
 
@@ -274,7 +274,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -350,7 +350,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +358,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,196 +524,196 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|gunakan notasi data ini"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +721,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +741,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +759,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,254 +767,254 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "preferensi tidak valid\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1022,11 +1022,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1324,12 +1324,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
@@ -1350,7 +1350,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
@@ -1367,99 +1367,100 @@ msgstr "dilewati: kunci publik telah diset\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "preferensi %c%lu tidak valid\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "Karakter tidak valid dalam string\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1472,20 +1473,20 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
@@ -1497,12 +1498,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1510,11 +1511,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1522,17 +1523,17 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1548,7 +1549,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1564,30 +1565,30 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1595,11 +1596,11 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1614,44 +1615,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1661,27 +1662,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1689,16 +1690,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1711,7 +1712,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1723,53 +1724,53 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1778,30 +1779,30 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
@@ -1820,7 +1821,7 @@ msgstr "`%s' sudah dikompresi\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat membuka: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -1887,21 +1888,21 @@ msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --always-trust\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2015,7 +2016,7 @@ msgstr "kunci %08lX: kunci baru - dilewati\n"
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -2202,118 +2203,129 @@ msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "ID User \"%s\" dibatalkan.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Apakah anda yakin masih ingin menandainya?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Ditandai? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Signature anda saat ini pada \"%s\"\n"
+"adalah signature.lokal \n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Apakah anda ingin menjadikannya signature yang full exportable?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 "\n"
 "Apakah anda ingin menjadikannya signature yang full exportable?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Apakah anda yakin masih ingin menandainya?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Ditandai? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2323,27 +2335,27 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2351,7 +2363,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2359,7 +2371,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2367,7 +2379,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2375,7 +2387,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2383,7 +2395,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2391,29 +2403,33 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Ditandai? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2421,7 +2437,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2429,445 +2445,452 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "Kunci dibatalkan.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2875,16 +2898,16 @@ msgstr ""
 "PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
 "         Menambahkan photo ID lain dapat membingungkan beberapa versi PGP.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2894,83 +2917,83 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -2979,7 +3002,7 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -2988,64 +3011,69 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
@@ -3063,7 +3091,7 @@ msgid "Keyring"
 msgstr "Keyring"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
@@ -3149,71 +3177,71 @@ msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -3257,7 +3285,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3471,41 +3499,45 @@ msgstr "bagian kunci rahasia tidak tersedia\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase tidak valid; silakan coba lagi"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
@@ -3517,42 +3549,42 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -3567,12 +3599,12 @@ msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3636,130 +3668,130 @@ msgstr "%s: gagal membuat hashtable: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "kunci %08lX muncul lebih dari satu kali dalam trustdb\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -3876,6 +3908,10 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
@@ -3893,12 +3929,16 @@ msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
@@ -4318,6 +4358,16 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Apakah anda yakin masih ingin menandainya?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Apakah anda yakin masih ingin menandainya?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Ditandai? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
 
diff --git a/po/it.po b/po/it.po
index a4b2f6ee7..2ff216476 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2001-07-11 21:23+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "quit"
 
@@ -274,7 +274,7 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -353,7 +353,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +361,170 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,207 +534,207 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +742,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -762,15 +762,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -780,7 +780,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -788,257 +788,257 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "elenca le impostazioni"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1046,11 +1046,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1356,12 +1356,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
@@ -1383,7 +1383,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
@@ -1401,100 +1401,100 @@ msgstr "%s: saltato: chiave pubblica gi� presente\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "elenca le impostazioni"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo � deprecato - la creo comunque? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1507,19 +1507,19 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
@@ -1531,12 +1531,12 @@ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1544,11 +1544,11 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1556,17 +1556,17 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1582,7 +1582,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1599,31 +1599,31 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1631,11 +1631,11 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1651,44 +1651,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1699,27 +1699,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1727,17 +1727,17 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1749,7 +1749,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1761,54 +1761,54 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1817,12 +1817,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1830,7 +1830,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1838,11 +1838,11 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Crea davvero? "
 
@@ -1861,7 +1861,7 @@ msgstr "%lu chiavi esaminate\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -1925,21 +1925,21 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2053,7 +2053,7 @@ msgstr "chiave %08lX: nuova chiave - saltata\n"
 msgid "no writable keyring found: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -2240,143 +2240,144 @@ msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Firmo davvero? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Firmo davvero? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2384,7 +2385,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2393,7 +2394,7 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2402,47 +2403,51 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Firmo davvero? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2450,7 +2455,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2458,559 +2463,565 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "showpref"
 msgstr "pref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3020,7 +3031,7 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3030,65 +3041,70 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "Firma %s da: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
@@ -3107,7 +3123,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
@@ -3194,72 +3210,72 @@ msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -3301,7 +3317,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3518,44 +3534,48 @@ msgstr "parti della chiave segreta non sono disponibili\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
@@ -3566,39 +3586,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "decifratura fallita: %s\n"
@@ -3613,12 +3633,12 @@ msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -3682,133 +3702,133 @@ msgstr "%s: creazione della tabella hash fallita: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "chiave %08lX: impossibile metterla nel trustdb\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica della chiave fidata - ignorata\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "trust record %lu: delete fallita: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "cambia il valore di fiducia"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chiave pubblica non trovata"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3928,6 +3948,10 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
@@ -3945,12 +3969,16 @@ msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "c'� una chiave segreta per questa chiave pubblica!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
@@ -4331,6 +4359,18 @@ msgstr "elenca le chiavi e le firme"
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Firmo davvero? "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "sono stati richiesti troppi bit casuali; il limite � %d\n"
 
diff --git a/po/ja.po b/po/ja.po
index 64a1f7690..8ada4495f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-02-08 08:47+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "quit"
 
@@ -276,7 +276,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'�������ޤ���: %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -360,172 +360,172 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -535,242 +535,242 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "gpg����������Ȥ����"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|��ID|���θ�����Ū�˿��Ѥ���"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -779,7 +779,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -799,15 +799,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -817,7 +817,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -825,255 +825,255 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1081,11 +1081,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -1387,12 +1387,12 @@ msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
@@ -1414,7 +1414,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
 
@@ -1432,100 +1432,100 @@ msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��Ѷػ�\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "`%s'�򥹥��å�: ��ʣ\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA��ElGamal (����)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1538,19 +1538,19 @@ msgstr ""
 "             ����θ�Ĺ�� 1024 �ӥå�\n"
 "         ����ο侩��Ĺ�� 2048 �ӥå�\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
@@ -1562,12 +1562,12 @@ msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1575,11 +1575,11 @@ msgstr ""
 "2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1587,17 +1587,17 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
 "����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1613,7 +1613,7 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1630,31 +1630,31 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "����̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "����%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1662,11 +1662,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "����Ǥ����Ǥ��� (y/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1682,44 +1682,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1730,27 +1730,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1758,17 +1758,17 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1780,7 +1780,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1791,54 +1791,54 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'����̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1846,28 +1846,28 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
@@ -1886,7 +1886,7 @@ msgstr "%lu����������ޤ���\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: �����ޤ���: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -1950,21 +1950,21 @@ msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
@@ -2078,7 +2078,7 @@ msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 msgid "no writable keyring found: %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'�ؤν�Ф�\n"
@@ -2263,149 +2263,150 @@ msgstr "��%08lX: �˴���������ɲ�\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "��%08lX: ��������̾��%d��\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[�˴�]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "�����˽�̾���ޤ���? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "�����˽�̾���ޤ���? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2414,7 +2415,7 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2423,47 +2424,51 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "�����˽�̾���ޤ���? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2471,7 +2476,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2480,558 +2485,564 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤������������˴����ޤ���? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "���θ����������˴����ޤ���? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �������˴��ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- �Ǥä��������˴���ȯ��\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �˴���ǧ�㳲: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3040,7 +3051,7 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3049,65 +3060,70 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "���θ����������˴����ޤ���? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
@@ -3126,7 +3142,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
@@ -3213,72 +3229,72 @@ msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -3321,7 +3337,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -3538,43 +3554,47 @@ msgstr "��̩��ʬ�������ޤ���\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ������� ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
 
@@ -3584,39 +3604,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ��ڤ˼���: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s���Ǥ��ޤ���: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
@@ -3631,12 +3651,12 @@ msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϻ��ѤǤ��ޤ���\n"
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
@@ -3700,133 +3720,133 @@ msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ���������緿��ID�Ǥ���ޤ���\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ�����\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "��%08lX: ���ѥǡ����١�������Ͽ�Ǥ��ޤ���\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "�� %08lX: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳����%lu, �ꥯ�����ȡ�������%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "���ѥ쥳����%lu: ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�����������Ĥ���ޤ���"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3940,6 +3960,10 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
@@ -3957,12 +3981,16 @@ msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "���֥��å��ΰ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "���θ������ˤ���������̩��������ޤ�!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n"
@@ -4335,6 +4363,18 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "�����˽�̾���ޤ���? "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "�����ࡦ�ӥåȤ򤿤������׵ᤷ�᤮�Ǥ����³��� %d\n"
 
diff --git a/po/nl.po b/po/nl.po
index a875e55f8..092b63fd4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "einde"
 
@@ -275,7 +275,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -360,170 +360,170 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -533,209 +533,209 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,17 +755,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
 "fouten in de vertaling aan <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +775,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,257 +783,257 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "het eerste teken van een notitienaam moet een letter of laag liggend steepje "
 "zijn\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1041,11 +1041,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1360,12 +1360,12 @@ msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
@@ -1387,7 +1387,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
@@ -1408,100 +1408,100 @@ msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
 # fixme
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "zelfondertekening wegschrijven\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1514,20 +1514,20 @@ msgstr ""
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
@@ -1539,12 +1539,12 @@ msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1552,11 +1552,11 @@ msgstr ""
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1564,17 +1564,17 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1590,7 +1590,7 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1607,32 +1607,32 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1640,11 +1640,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1660,44 +1660,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1708,28 +1708,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1737,17 +1737,17 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1759,7 +1759,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1772,54 +1772,54 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1828,12 +1828,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1841,7 +1841,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1849,11 +1849,11 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Echt maken? "
 
@@ -1872,7 +1872,7 @@ msgstr "%lu sleutels verwerkt\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: kon niet openen: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
@@ -1936,22 +1936,22 @@ msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[gebruiker niet gevonden]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -2068,7 +2068,7 @@ msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
@@ -2260,144 +2260,145 @@ msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "%d gebruikersidentificaties gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Echt tekenen? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Echt tekenen? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2405,7 +2406,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2414,7 +2415,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2423,48 +2424,52 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Echt tekenen? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2472,7 +2477,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2480,560 +2485,566 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3042,7 +3053,7 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3051,65 +3062,70 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
@@ -3128,7 +3144,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
@@ -3216,74 +3232,74 @@ msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -3325,7 +3341,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -3545,45 +3561,49 @@ msgstr "geheime sleutel niet beschikbaar"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
 "opnieuw.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
 "ondertekeningen!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
@@ -3593,39 +3613,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "ontsleuteling mislukte: %s\n"
@@ -3641,12 +3661,12 @@ msgid "input line longer than %d characters\n"
 msgstr "invoerregel langer dan %d tekens\n"
 
 # Untranslated.
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseed failed: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3710,135 +3730,135 @@ msgstr "%s: kon frommeltabel niet aanmaken: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fout bij het bijwerken van versieveld: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fout bij het lezen van het versieveld: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fout bij het schrijven van het versieveld: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "vertrouwensdatabase: lseek mislukte: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "vertrouwensdatabase: lezen mislukte (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: is geen vertrouwensdatabasebestand\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versieveld met recnr %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ongeldige bestandsversie %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fout bij het lezen van een beschikbaar veld: %s\n"
 
 # dir?
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fout bij het schrijven van indexveld: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: veld met nullen vullen lukte niet: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kon geen veld toevoegen: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "sleutel %08lX: geaccepteerd als een betrouwbare sleutel.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "sleutel %08lX: kan niet toevoegen aan de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "vertrouwensveld %lu, req type %d: lezen mislukte: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "vertrouwensveld %lu: verwijderen mislukte: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "vertrouwensveld %lu, type %d: schrijven mislukte: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: is geen vertrouwensdatabasebestand\n"
 
 # Untranslated.
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb rec %lu: lseed failed: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "publieke sleutel niet gevonden"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3959,6 +3979,10 @@ msgstr ""
 "kon het aanmaken van een zwakke sleutel voor het symmetrische\n"
 "algoritme niet voorkomen; ik heb het %d keer geprobeerd!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
@@ -3976,12 +4000,16 @@ msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
@@ -4350,6 +4378,18 @@ msgstr "sleutels en ondertekeningen opnoemen"
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Echt tekenen? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 
diff --git a/po/pl.po b/po/pl.po
index 1c59726c9..8f9178a28 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-04-10 01:42+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -55,7 +55,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "wyj�cie"
 
@@ -282,7 +282,7 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
@@ -362,7 +362,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -370,167 +370,167 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[pliki]|szyfrowanie plik�w"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "tylko zapis danych w formacie OpenPGP"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[pliki]|odszyfrowywanie plik�w"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr ""
 "z�o�enie na kluczu podpisu nie podlegaj�cego \n"
 "uniewa�nieniu"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "z�o�enie na kluczu podpisu prywatnego,\n"
 "nie podlegaj�cego uniewa�nieniu"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie kluczy z serwera"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "automatyczne uaktualnienie bazy zaufania"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -540,196 +540,196 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "bez wymuszania trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "wymuszenie czwartej wersji formatu podpis�w"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "bez wymuszania czwartej wersji formatu podpis�w"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "do szyfrowania nie zostanie u�yty MDC"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "wykorzystanie gpg-agenta"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "okazanie, w kt�rym zbiorze kluczy znajduje si� dany klucz"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[plik]|zapisa� opis stanu do pliku"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|klucz ca�kowicie zaufany"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tryb zgodno�ci formatu pakiet�w, szyfr�w i skr�t�w z OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tryb zgodno�ci format�w, szyfr�w i skr�t�w z PGP 2.x"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb obliczania has�a"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm skr�tu dla has�a ALG"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie numer�w kluczy adresat�w z zaszyfrowanych pakiet�w"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia u�ytkownika"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "bez pokazywania zdj��"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "polecenie wywo�ania przegl�darki do zdj��"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -737,7 +737,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -758,15 +758,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +776,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,251 +784,251 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "niezrozuma�y URI serwera\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "tej wiadomo�ci mo�e nie da� si� odczyta� za pomoc� PGP 2.x\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "niew�a�ciwe ustawienia\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1036,11 +1036,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� ,='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -1336,12 +1336,12 @@ msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany\n"
@@ -1362,7 +1362,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
@@ -1379,99 +1379,100 @@ msgstr "pomini�ty: zosta� ju� wybrany\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy�lny adresat '%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ycia\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "ustawienie %c%lu jest niepoprawne\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "ustawienie %c%lu powtarza si�\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "zbyt wiele `%c' ustawie�\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "niew�a�ciwy znak w tek�cie\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "U�ywanie tego algorytmu jest odradzane - tworzy� mimo to? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1484,20 +1485,20 @@ msgstr ""
 "               domy�lny rozmiar klucza wynosi 1024 bity\n"
 "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
@@ -1509,12 +1510,12 @@ msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du�y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1522,11 +1523,11 @@ msgstr ""
 "Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� obliczenia\n"
 "trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1534,17 +1535,17 @@ msgstr ""
 "Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
 "komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1560,7 +1561,7 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1576,30 +1577,30 @@ msgstr ""
 "      <n>m = termin wa�no�ci podpisu up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci podpisu up�ywa za n lat\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1607,11 +1608,11 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1627,44 +1628,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1675,49 +1676,49 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "czy (W)yj��? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej�� (D)alej czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1729,7 +1730,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1743,53 +1744,53 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
 "entropii.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1797,12 +1798,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\"\n"
 "mo�na doda� do niego podklucz u�ywany do szyfrowania.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1810,7 +1811,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1818,12 +1819,12 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "UWAGA: tworzenie podkluczy dla kluczy wersji 3 jest niezgodne z OpenPGP.\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Na pewno utworzy�? "
 
@@ -1842,7 +1843,7 @@ msgstr "`%s' ju� jest spakowany\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo�na otworzy�: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -1908,22 +1909,22 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Niepoprawny klucz %08lX uznany za poprawny przez opcj� --always-trust.\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -2037,7 +2038,7 @@ msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -2228,119 +2229,129 @@ msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika bez podpis�w w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Czy na pewno chcesz to podpisa�?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Czy dalej chcesz je doda�? (t/n) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Czy na pewno podpisa�? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"Tw�j podpis na \"%s\"\n"
+"jest podpisem prywatnym (lokalnym).\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 "\n"
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ju� zosta� %spodpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ju� zosta� %spodpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Czy na pewno chcesz go podpisa�?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Czy na pewno podpisa�? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Okres wa�no�ci tego klucza ko�czy si� %s.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Czy chcesz �eby wa�no�� podpisu wygasa�a w tej samej chwili? (t/n) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "tej wiadomo�ci mo�e nie da� si� odczyta� za pomoc� PGP 2.x\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2349,27 +2360,27 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2377,7 +2388,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2385,7 +2396,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2393,7 +2404,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2401,7 +2412,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a przez mnie w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2409,7 +2420,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2417,29 +2428,33 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Czy na pewno podpisa�? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2447,7 +2462,7 @@ msgstr ""
 "Wprowad� nowe d�ugie has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2455,447 +2470,454 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nupodpis"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "z�o�enie na kluczu podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nulpodpis"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "z�o�enie na kluczu lokalnego podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "dodfoto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "usfoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "g��wny"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "ustaw"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "aktopc"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "foto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "Klucz uniewa�niony.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s %s%s.\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  utworzony: %s, wa�ny do: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2904,16 +2926,16 @@ msgstr ""
 "             Dodanie drugiego spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             rozumie� ten klucz.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/n) "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Do klucza mo�na do��czy� tylko jedno zdj�cie.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2923,83 +2945,83 @@ msgstr ""
 "niekt�re \n"
 "             wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla wersji 2 PGP nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3008,7 +3030,7 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3017,64 +3039,69 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Okres wa�no�ci tego klucza ko�czy si� %s.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/n) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
@@ -3092,7 +3119,7 @@ msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr " [wygasa :%s]"
@@ -3178,72 +3205,72 @@ msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go przyj��\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -3285,7 +3312,7 @@ msgstr "wi�cej informacji jest tutaj: http://www.gnupg.org/why-not-idea.html\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -3500,43 +3527,47 @@ msgstr "tajne cz�ci klucza s� niedost�pne\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Niepoprawne has�o; prosz� spr�bowa� ponownie"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� has�o.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
 "nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
@@ -3548,39 +3579,39 @@ msgid ""
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozkodowa� urla regulaminu, pozostanie zakodowany.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign 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:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -3595,12 +3626,12 @@ msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -3664,132 +3695,132 @@ msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: procedura lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nie jest poprawnym d�ugim numerem klucza\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "klucz %08lX: zaakceptowany jako klucz zaufany\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "klucz %08lX jest wpisany wi�cej ni� raz w bazie zaufania\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3908,6 +3939,10 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
@@ -3925,12 +3960,16 @@ msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
@@ -4345,6 +4384,16 @@ msgstr "%lu kluczy (%lu podpis�w)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Czy na pewno chcesz to podpisa�?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Czy na pewno chcesz go podpisa�?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Czy na pewno podpisa�? "
+
 #~ msgid "Do you really need such a large keysize? "
 #~ msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
diff --git a/po/pt.po b/po/pt.po
index 65099b802..da0189f55 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-03-05 16:05+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "n�o"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "sair"
 
@@ -275,7 +275,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|decifrar ficheiros"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave de forma n�o revoc�vel"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente e de forma n�o revoc�vel"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "actualizar automaticamente a base de dados de confian�a"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,214 +526,214 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "n�o for�ar assinaturas v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v4"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "n�o for�ar assinaturas v4"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "nunca usar um MDC para cifrar"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escrever ifnroam��es de estado para o ficheiro"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote, cifragem e \"digest\"\n"
 "para comportamento OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "configurar todas as op��es de pacote, cifragem e \"digest\"\n"
 "para comportamento PGP 2.x"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "N�o mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -741,7 +741,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -761,15 +761,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -779,7 +779,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -787,251 +787,251 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo PGP 2.x\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "prefer�ncias inv�lidas\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1039,12 +1039,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
@@ -1342,12 +1342,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1368,7 +1368,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
@@ -1385,99 +1385,100 @@ msgstr "ignorado: a chave p�blica j� est� presente\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "prefer�ncia %c%lu n�o � v�lida\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "prefer�ncia %c%lu duplicada\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "demasiadas prefer�ncias `%c'\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "caracter inv�lido na cadeia de caract�res\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "A utiliza��o destes algoritmos est� desactualizada - criar na mesma?"
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1490,19 +1491,19 @@ msgstr ""
 "         tamanho por omiss�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
@@ -1514,12 +1515,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1527,11 +1528,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
 "porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1539,17 +1540,17 @@ msgstr ""
 "Tudo bem, mas n�o se esque�a que a radia��o do seu monitor e teclado tamb�m "
 "� extremamente vulner�vel a ataques!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1565,7 +1566,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1581,30 +1582,30 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1612,11 +1613,11 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1633,44 +1634,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1681,29 +1682,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
 "coment�rio\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1711,16 +1712,16 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1732,7 +1733,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1744,53 +1745,53 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma hip�tese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1798,12 +1799,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1811,7 +1812,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1819,11 +1820,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -1842,7 +1843,7 @@ msgstr "%s' j� comprimido\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1908,21 +1909,21 @@ msgstr "entradas demais no cache pk - desactivado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --always-trust\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2036,7 +2037,7 @@ msgstr "chave %08lX: chave nova - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -2223,118 +2224,128 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Identificador do utilizador \"%s\" est� revocado.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Voc� tem certeza de que quer assin�-la?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Realmente assinar? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"A sua assinatura actual em \"%s\"\n"
+"� uma assinatura local.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Quer promov�-la a uma assinatura export�vel?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 "\n"
 "Quer promov�-la a uma assinatura export�vel?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Voc� tem a certeza que quer mesmo assim assin�-la?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Realmente assinar? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (s/n) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr "s� pode assinar com chaves do tipo PGP 2.x no modo --pgp2\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "esta mensagem poder� n�o ser utiliz�vel pelo PGP 2.x\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2344,27 +2355,27 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2372,7 +2383,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2380,7 +2391,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2388,7 +2399,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2396,7 +2407,7 @@ msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2404,7 +2415,7 @@ msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2412,29 +2423,33 @@ msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Realmente assinar? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2442,7 +2457,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2450,446 +2465,453 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma n�o-revog�vel"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma n�o revog�vel"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "prefer�ncias actualizadas"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, 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:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "A chave est� revogada.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, 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:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 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:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Esta chave pode ser revogada pela chave %s %s%s\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��o falsa encontrada\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2897,16 +2919,16 @@ msgstr ""
 "AVISO: Esta chave j� tem um identificador fotogr�fico.\n"
 "       Se adicionar outro pode confundir algumas vers�o do PGP.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "S� pode ter um identificador fotogr�fico por chave.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2915,84 +2937,84 @@ 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:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 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:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3001,7 +3023,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3010,64 +3032,69 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
@@ -3085,7 +3112,7 @@ msgid "Keyring"
 msgstr "Porta-chaves"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
@@ -3171,71 +3198,71 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -3278,7 +3305,7 @@ msgstr "veja http://www.gnupg.org/why-not-idea.html para mais informa��es\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -3494,42 +3521,46 @@ msgstr "partes da chave secreta n�o dispon�veis\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
 
@@ -3541,39 +3572,39 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -3588,12 +3619,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -3657,135 +3688,135 @@ msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n�o � um identificador longo de chave v�lido\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "chave %08lX: aceite como chave de confian�a\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "chave %08lX ocrreu mais do que uma vez na base de dados de confian�a\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
 "chave %08lX: nenhuma chave p�blica para chave de confian�a - ignorada\n"
 "\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3902,6 +3933,10 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
@@ -3919,12 +3954,16 @@ msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
@@ -4340,6 +4379,16 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Voc� tem certeza de que quer assin�-la?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Voc� tem a certeza que quer mesmo assim assin�-la?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Realmente assinar? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a61b6d29e..85d252ec5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator: Rafael Caetano dos Santos <[email protected]>\n"
 "Language-Team: ?\n"
@@ -48,7 +48,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "sair"
 
@@ -279,7 +279,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -356,7 +356,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -364,175 +364,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -542,166 +542,166 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
@@ -709,63 +709,63 @@ msgstr ""
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -785,15 +785,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -803,7 +803,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -811,258 +811,258 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1070,12 +1070,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
@@ -1383,12 +1383,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
@@ -1428,102 +1428,102 @@ msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
 # muitas ou demais ???
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "Prefer�ncias demais"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1536,20 +1536,20 @@ msgstr ""
 "              tamanho padr�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
@@ -1561,12 +1561,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1574,11 +1574,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
 "porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1586,17 +1586,17 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado tamb�m "
 "� vulner�vel a ataques!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1612,7 +1612,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1629,31 +1629,31 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1661,11 +1661,11 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1681,44 +1681,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1729,28 +1729,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1758,17 +1758,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1780,7 +1780,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1792,54 +1792,54 @@ msgstr ""
 "gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1847,12 +1847,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1860,7 +1860,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1868,11 +1868,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -1891,7 +1891,7 @@ msgstr "%lu chaves processadas\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -1955,22 +1955,22 @@ msgstr "entradas demais no cache pk - desativado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2084,7 +2084,7 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -2271,143 +2271,144 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+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:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Realmente assinar? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "Voc� tem certeza de que quer este tamanho de chave? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Realmente assinar? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2415,7 +2416,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2424,7 +2425,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2433,48 +2434,52 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Realmente assinar? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2482,7 +2487,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2490,561 +2495,567 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 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:1074
+#: g10/keyedit.c:1109
 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:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, 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:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3053,7 +3064,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3062,65 +3073,70 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, 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:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
@@ -3139,7 +3155,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -3226,74 +3242,74 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -3337,7 +3353,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -3557,43 +3573,47 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
@@ -3603,39 +3623,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -3650,12 +3670,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
@@ -3719,135 +3739,135 @@ msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3969,6 +3989,10 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
@@ -3986,12 +4010,16 @@ msgstr "Esta � uma chave secreta! - realmente deletar? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
@@ -4352,6 +4380,18 @@ msgstr "listar as chaves e as assinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Realmente assinar? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 
diff --git a/po/sv.po b/po/sv.po
index 4313dba94..c7d931bd9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2001-08-23 10:32+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "avsluta"
 
@@ -286,7 +286,7 @@ msgstr "... detta �r ett fel i programmet (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat ett fel i programmet ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
@@ -364,7 +364,7 @@ msgstr ""
 "en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
 "(Beh�ver %d fler byte)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -372,170 +372,170 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,203 +545,203 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 # syftar p� ett anv�ndargr�nsnitt i ett separat program, till exempel gpa
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "anv�nd gpg-agenten"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|NYCKELID|lita ovillkorligen p� denna nyckel"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -749,7 +749,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -769,17 +769,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -789,7 +789,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -797,117 +797,117 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "VARNING: \"%s\" �r en tom fil\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBSERVERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -918,145 +918,145 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �r �nd� litet. Eventuellt borde meddelandena inte alls
 # �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
 # f�r internationella fels�kare
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "skriv ut inst�llningar"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
 "ett understrykningstecken (_)\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1064,11 +1064,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -1379,12 +1379,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det �r inte s�kert att signaturen tillh�r �garen.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s �verhoppad\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
@@ -1404,7 +1404,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Hittade inte anv�ndaridentiteten.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade �ver: den publika nyckeln �r redan satt som f�rvald mottagare\n"
@@ -1423,100 +1423,100 @@ msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade �ver: den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr ""
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, fuzzy, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "hoppade �ver \"%s\": kopia\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, fuzzy, c-format
 msgid "too many `%c' preferences\n"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keygen.c:256
+#: g10/keygen.c:257
 #, fuzzy
-msgid "invalid character in string\n"
+msgid "invalid character in preference string\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "skriver sj�lvsignatur\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; anv�nder %u bitar\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad upp�t till %u bitar\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Anv�ndanadet av denna algoritm �r f�rlegat - skapa �nd�? "
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1529,20 +1529,20 @@ msgstr ""
 "              den f�rvalda nyckelstorleken �r 1024 bitar\n"
 "    den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA till�ter bara nyckelstorlekar fr�n 512 till 1024\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "nyckelstorleken �r f�r liten; 1024 �r det minsta till�tna v�rdet f�r RSA.\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken �r f�r liten; 768 �r det minsta till�tna v�rdet.\n"
 
@@ -1554,12 +1554,12 @@ msgstr "nyckelstorleken �r f�r liten; 768 �r det minsta till�tna v�rdet.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "nyckelstorleken �r f�r stor; %d �r det st�rsta till�tna v�rdet\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1567,11 +1567,11 @@ msgstr ""
 "Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
 "eftersom ber�kningar tar MYCKET l�ng tid!\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1579,18 +1579,18 @@ msgstr ""
 "Ok, men kom ih�g att din bildsk�rm och ditt tangentbord ocks� s�nder\n"
 "avsl�jande str�lning som kan avlyssnas!\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade upp�t till %u bitar\n"
 
 # borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1607,7 +1607,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
 # borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1624,31 +1624,31 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n m�nader\n"
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "ogiltigt v�rde\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Nyckeln g�r aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1656,11 +1656,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare �n �r 2038.\n"
 "Datum fram till �r 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "St�mmer detta (j/n)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1676,44 +1676,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Namnet f�r inte b�rja med en siffra\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "Epostadressen �r ogiltig\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1724,28 +1724,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte epostadressen som namn eller kommentar\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ndra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1753,17 +1753,17 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1774,7 +1774,7 @@ msgstr ""
 "Jag kommer att g�ra det �nd�. Du kan �ndra din l�senordsfras n�rsomhelst\n"
 "om du anv�nder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1786,54 +1786,54 @@ msgstr ""
 "h�rddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en st�rre chans att samla ihop en tillr�cklig m�ngd entropi.\n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certifikat som leder till en p�litlig nyckel:\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1842,13 +1842,13 @@ msgstr ""
 "att vilja anv�nda kommandot \"--edit-key\" f�r att generera en sekund�r\n"
 "nyckel f�r detta syfte.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1856,7 +1856,7 @@ msgstr ""
 "nyckeln �r skapad %lu sekund in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1864,11 +1864,11 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
@@ -1887,7 +1887,7 @@ msgstr "%lu nycklar behandlade\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte �ppna: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av l�senordsfras: %s\n"
@@ -1951,21 +1951,21 @@ msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Hittade inte anv�ndaridentiteten]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "anv�nder sekund�ra nyckeln %08lX ist�llet f�r prim�rnyckeln %08lX\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
@@ -2080,7 +2080,7 @@ msgstr "nyckeln %08lX: ny nyckel - �verhoppad\n"
 msgid "no writable keyring found: %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
@@ -2267,143 +2267,144 @@ msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[�terkallelse]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[sj�lvsignatur]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:217
+#: g10/keyedit.c:218
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 anv�ndaridentitet utan giltig sj�lvsignatur hittades\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
 #, fuzzy
-msgid "Are you sure you still want to sign it?\n"
+msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Vill du verkligen signera? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
+#: g10/keyedit.c:362
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
-"\n"
-"Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:366
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr ""
+
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:384
+#: g10/keyedit.c:391
 #, fuzzy, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Notera: Denna nyckel har g�tt ut!\n"
 
-#: g10/keyedit.c:415
-#, fuzzy
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Vill du verkligen signera? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+
+#: g10/keyedit.c:471
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr ""
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2411,7 +2412,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 #, fuzzy
 msgid ""
 "\n"
@@ -2420,7 +2421,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 #, fuzzy
 msgid ""
 "\n"
@@ -2429,47 +2430,51 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Vill du verkligen signera? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den prim�ra nyckeln �r inte tillg�ngliga.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2477,7 +2482,7 @@ msgstr ""
 "Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2485,561 +2490,567 @@ msgstr ""
 "Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "nrlsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "add a photo ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 #, fuzzy
 msgid "set preference list"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 #, fuzzy
 msgid "updated preferences"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "�ndra l�senordsfrasen"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "�terkalla en sekund�r nyckel"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "kan ej g�ra detta i batch-l�ge\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 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:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1042
 #, fuzzy
-msgid "Key is revoked.\n"
+msgid "Key is revoked."
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen �terkalla de valda nycklarna? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 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:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "VARNING: Denna nyckel har �terkallats av sin �gare!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  skapad: %s g�r ut: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! en undernyckel har �terkallats: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "rev- hittade felaktig �terkallelse\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem vid kontroll av �terkallandet: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 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:1636
+#: g10/keyedit.c:1688
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna sj�lvsignatur? (j/N)"
 
 # skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1932
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -3048,7 +3059,7 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3057,65 +3068,70 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett �terkallelsecertifikat f�r denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �terkallad av %08lX %s\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
@@ -3134,7 +3150,7 @@ msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
@@ -3228,75 +3244,75 @@ msgstr "OBSERVERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n"
 "att applicera\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "ingen frikopplad signatur\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -3339,7 +3355,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d f�r publik nyckelhantering\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -3554,44 +3570,48 @@ msgstr "de hemliga nyckeldelarna �r inte tillg�nliga\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "skyddsalgoritmen %d st�ds inte\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 #, fuzzy
 msgid "Invalid passphrase; please try again"
 msgstr "Ogiltig l�senordsfras, f�rs�k igen ...\n"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr ""
 
 # �r det nyckeln som �r svag, konstigt
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Uppt�ckte en svag nyckel - byt l�senordsfras igen.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "detta �r en PGP-genererad ElGamal-nyckel som INTE �r s�ker f�r signaturer!\n"
 
 # beh�vs verkligen c-format h�r?
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "den publika nyckeln �r %lu sekund nyare �n signaturen\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln �r %lu sekunder nyare �n signaturen\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "OBSERVERA: signaturnyckeln %08lX, gick ut vid %s\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen �r felaktig eftersom en ok�nd kritisk bit �r satt\n"
@@ -3602,39 +3622,39 @@ msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "f�rs�k att verifiera signaturen misslyckades: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" �r en tom fil\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "dekrypteringen misslyckades: %s\n"
@@ -3649,12 +3669,12 @@ msgstr "kan inte hantera text med rader l�ngre �n %d tecken\n"
 msgid "input line longer than %d characters\n"
 msgstr "indataraden �r l�ngre �n %d tecken\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
@@ -3718,135 +3738,135 @@ msgstr "%s: misslyckades med att skapa hash-tabell: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid l�sning av versionspost: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: l�sning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ej en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid l�sning av ledig post: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid l�sning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollst�lla en post: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att l�gga till en post: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen �r trasig, k�r \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, fuzzy, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" �r en ogiltig l�ng nyckelidentitet\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "nyckel %08lX: accepterad som en p�litlig nyckel\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, fuzzy, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "nyckel %08lX: kan inte l�gga till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "nyckel %08lX: hittade ingen motsvarande publik nyckel - �verhoppad\n"
 
 # req �r nog felstavat i originalet d� det syftar p� record och inte
 # request
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, posttyp %d: kunde inte l�sa: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, fuzzy, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "tillitspost %lu: kunde inte radera: %s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: ej en tillitsdatabasfil\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "hittade inte publik nyckel"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3965,6 +3985,10 @@ msgstr ""
 "kan inte undvika en svag nyckel f�r symmetriskt chiffer; f�rs�kte\n"
 "%d g�nger!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte g�ra s� i batch-l�ge utan flaggan \"--yes\"\n"
@@ -3982,12 +4006,16 @@ msgstr "Detta �r en hemlig nyckel! - vill du verkligen ta bort den? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, fuzzy, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "det finns en hemlig nyckel tillh�rande denna publika nyckel!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 #, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "anv�nd flaggan \"--delete-secret-key\" f�r att ta bort den f�rst.\n"
@@ -4373,6 +4401,18 @@ msgstr "r�kna upp nycklar och signaturer"
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
+#, fuzzy
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+
+#, fuzzy
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Vill du verkligen signera? "
+
 #~ msgid "too many random bits requested; the limit is %d\n"
 #~ msgstr "f�r m�nga slumpm�ssiga bitar efterfr�gades; maximalt antal �r %d\n"
 
diff --git a/po/tr.po b/po/tr.po
index a338a775a..158283606 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-09 19:04+0200\n"
+"POT-Creation-Date: 2002-04-19 11:22+0200\n"
 "PO-Revision-Date: 2002-03-05 08:35+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:778 util/miscutil.c:329
+#: g10/keyedit.c:810 util/miscutil.c:329
 msgid "quit"
 msgstr "çıkış"
 
@@ -275,7 +275,7 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1549
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:279
+#: g10/g10.c:281
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:281
+#: g10/g10.c:283
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:282
+#: g10/g10.c:284
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:283
+#: g10/g10.c:285
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:284
+#: g10/g10.c:286
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:285
+#: g10/g10.c:287
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar şifrelenir"
 
-#: g10/g10.c:286
+#: g10/g10.c:288
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:287
+#: g10/g10.c:289
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:288
+#: g10/g10.c:290
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:289
+#: g10/g10.c:291
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:290
+#: g10/g10.c:292
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:292
+#: g10/g10.c:294
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:294
+#: g10/g10.c:296
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:295
+#: g10/g10.c:297
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:296
+#: g10/g10.c:298
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:297
+#: g10/g10.c:299
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:298
+#: g10/g10.c:300
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:299
+#: g10/g10.c:301
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:301
+#: g10/g10.c:303
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:302
+#: g10/g10.c:304
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:303
+#: g10/g10.c:305
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:304
+#: g10/g10.c:306
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:305
+#: g10/g10.c:307
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:306
+#: g10/g10.c:308
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:307
+#: g10/g10.c:309
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:308
+#: g10/g10.c:310
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:309
+#: g10/g10.c:311
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:310
+#: g10/g10.c:312
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:312
+#: g10/g10.c:314
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:314
+#: g10/g10.c:316
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:318
+#: g10/g10.c:320
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:320
+#: g10/g10.c:322
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:322
+#: g10/g10.c:324
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:324
+#: g10/g10.c:326
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:326
+#: g10/g10.c:328
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:328
+#: g10/g10.c:330
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:329
+#: g10/g10.c:331
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:330
+#: g10/g10.c:332
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:332
+#: g10/g10.c:334
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:334
+#: g10/g10.c:336
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:338
+#: g10/g10.c:340
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,198 +526,198 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:340
+#: g10/g10.c:342
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:342
+#: g10/g10.c:344
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:345
+#: g10/g10.c:347
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:347
+#: g10/g10.c:349
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:354
+#: g10/g10.c:356
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:356
+#: g10/g10.c:358
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:369
+#: g10/g10.c:371
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:371
+#: g10/g10.c:373
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:373
+#: g10/g10.c:375
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:375
+#: g10/g10.c:377
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:385
+#: g10/g10.c:387
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:389
+#: g10/g10.c:391
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: g10/g10.c:390
+#: g10/g10.c:392
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:394
+#: g10/g10.c:396
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:396
+#: g10/g10.c:398
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:404
+#: g10/g10.c:406
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:405
+#: g10/g10.c:407
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini OpenPGP tarzında ayarlar"
 
-#: g10/g10.c:406
+#: g10/g10.c:408
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini PGP 2.x'e göre ayarlar"
 
-#: g10/g10.c:410
+#: g10/g10.c:412
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM "
 "kullanılır"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|İSİM|anahtar parolaları için şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:415
+#: g10/g10.c:418
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:416
+#: g10/g10.c:419
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:417
+#: g10/g10.c:420
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:418
+#: g10/g10.c:421
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:419
+#: g10/g10.c:422
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:420
+#: g10/g10.c:423
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:421
+#: g10/g10.c:424
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:422
+#: g10/g10.c:425
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
 
-#: g10/g10.c:425
+#: g10/g10.c:428
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -725,7 +725,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:428
+#: g10/g10.c:431
 msgid ""
 "@\n"
 "Examples:\n"
@@ -745,15 +745,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:567
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:567
+#: g10/g10.c:571
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:570
+#: g10/g10.c:574
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -763,7 +763,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:581
+#: g10/g10.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -771,248 +771,248 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:659
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:712
+#: g10/g10.c:716
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:891
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:889
+#: g10/g10.c:895
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:896
+#: g10/g10.c:902
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1185
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1202
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1211
+#: g10/g10.c:1216
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1234 g10/g10.c:1250
+#: g10/g10.c:1239 g10/g10.c:1255
 #, fuzzy, c-format
 msgid "WARNING: %s is a deprecated option.\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/g10.c:1236 g10/g10.c:1253
+#: g10/g10.c:1241 g10/g10.c:1258
 #, c-format
 msgid "please use \"--keyserver-options %s\" instead\n"
 msgstr ""
 
-#: g10/g10.c:1324
+#: g10/g10.c:1329
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1328
+#: g10/g10.c:1333
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1335 g10/g10.c:1346
+#: g10/g10.c:1340 g10/g10.c:1351
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:1337 g10/g10.c:1357
+#: g10/g10.c:1342 g10/g10.c:1362
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1340
+#: g10/g10.c:1345
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1366
+#: g10/g10.c:1371
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:1372
+#: g10/g10.c:1377
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:1378
+#: g10/g10.c:1383
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:1391
+#: g10/g10.c:1396
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1405 g10/sign.c:614
-#: g10/sign.c:792
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1410 g10/sign.c:620
+#: g10/sign.c:798
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "bu ileti PGP 2.x tarafından kullanılamayabilir\n"
 
-#: g10/g10.c:1446 g10/g10.c:1458
+#: g10/g10.c:1451 g10/g10.c:1463
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1452 g10/g10.c:1464
+#: g10/g10.c:1457 g10/g10.c:1469
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1468
+#: g10/g10.c:1473
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:1472
+#: g10/g10.c:1477
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:1475
+#: g10/g10.c:1480
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
-#: g10/g10.c:1477
+#: g10/g10.c:1482
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1479
+#: g10/g10.c:1484
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1481
+#: g10/g10.c:1486
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:1484
+#: g10/g10.c:1489
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1488
+#: g10/g10.c:1493
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1497
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı denetim seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:1495
+#: g10/g10.c:1500
 msgid "invalid preferences\n"
 msgstr "tercihler geçersiz\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1594
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1614
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1616
+#: g10/g10.c:1621
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1624
+#: g10/g10.c:1629
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1641
+#: g10/g10.c:1646
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1654
+#: g10/g10.c:1659
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1668
+#: g10/g10.c:1673
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:1677
+#: g10/g10.c:1682
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1695
+#: g10/g10.c:1700
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1711
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1714
+#: g10/g10.c:1719
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1722
+#: g10/g10.c:1727
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:1730
+#: g10/g10.c:1735
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:1738
+#: g10/g10.c:1743
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:307 g10/g10.c:1794 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1799 g10/sign.c:709
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1814
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:1892
+#: g10/g10.c:1897
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1905
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:1987
+#: g10/g10.c:1992
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2073
+#: g10/g10.c:2078
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2082
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2080 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2085 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2289
+#: g10/g10.c:2294
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2300
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1020,13 +1020,13 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2306
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış "
 "olmalıdır\n"
 
-#: g10/g10.c:2309
+#: g10/g10.c:2314
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
@@ -1325,12 +1325,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:874 g10/pkclist.c:929
+#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:723 g10/pkclist.c:903
+#: g10/pkclist.c:723 g10/pkclist.c:911
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
@@ -1351,7 +1351,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:781
+#: g10/pkclist.c:781 g10/pkclist.c:857
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
@@ -1368,99 +1368,100 @@ msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 msgid "unknown default recipient `%s'\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:885
+#: g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:935
+#: g10/pkclist.c:943
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
-#: g10/keygen.c:179
+#: g10/keygen.c:180
 #, c-format
 msgid "preference %c%lu is not valid\n"
 msgstr "%c%lu tercihi geçersiz\n"
 
-#: g10/keygen.c:186
+#: g10/keygen.c:187
 #, c-format
 msgid "preference %c%lu duplicated\n"
 msgstr "%c%lu tercihi yinelendi\n"
 
-#: g10/keygen.c:191
+#: g10/keygen.c:192
 #, c-format
 msgid "too many `%c' preferences\n"
 msgstr "`%c' tercih çok fazla\n"
 
-#: g10/keygen.c:256
-msgid "invalid character in string\n"
+#: g10/keygen.c:257
+#, fuzzy
+msgid "invalid character in preference string\n"
 msgstr "dizgedeki karakter geçersiz\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:399
 msgid "writing self signature\n"
 msgstr "öz-imza yazılıyor\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:443
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:485 g10/keygen.c:569 g10/keygen.c:660
+#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:490 g10/keygen.c:574 g10/keygen.c:665
+#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:777
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/keygen.c:767
+#: g10/keygen.c:779
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:780
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:770
+#: g10/keygen.c:782
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:771
+#: g10/keygen.c:783
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (imzalamak ve şifrelemek için)\n"
 
-#: g10/keygen.c:772
+#: g10/keygen.c:784
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:774
+#: g10/keygen.c:786
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keyedit.c:476 g10/keygen.c:777
+#: g10/keyedit.c:508 g10/keygen.c:789
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:809
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
-#: g10/keyedit.c:489 g10/keygen.c:811
+#: g10/keyedit.c:521 g10/keygen.c:823
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/keygen.c:824
+#: g10/keygen.c:836
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1473,20 +1474,20 @@ msgstr ""
 "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
 "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "What keysize do you want? (1024) "
 msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
 
-#: g10/keygen.c:838
+#: g10/keygen.c:850
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
 
-#: g10/keygen.c:840
+#: g10/keygen.c:852
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
 
-#: g10/keygen.c:843
+#: g10/keygen.c:855
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
 
@@ -1498,12 +1499,12 @@ msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit't
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:854
+#: g10/keygen.c:866
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:871
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1511,11 +1512,11 @@ msgstr ""
 "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
 "2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:862
+#: g10/keygen.c:874
 msgid "Are you sure that you want this keysize? "
 msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
 
-#: g10/keygen.c:863
+#: g10/keygen.c:875
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1523,17 +1524,17 @@ msgstr ""
 "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
 "kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:884
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:875 g10/keygen.c:879
+#: g10/keygen.c:887 g10/keygen.c:891
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:930
+#: g10/keygen.c:942
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1549,7 +1550,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:939
+#: g10/keygen.c:951
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1565,30 +1566,30 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:973
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:963
+#: g10/keygen.c:975
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:968
+#: g10/keygen.c:980
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:973
+#: g10/keygen.c:985
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:980
+#: g10/keygen.c:992
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:986
+#: g10/keygen.c:998
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1596,11 +1597,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1003
 msgid "Is this correct (y/n)? "
 msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1034
+#: g10/keygen.c:1046
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1616,44 +1617,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1058
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1066
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1056
+#: g10/keygen.c:1068
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1070
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1066
+#: g10/keygen.c:1078
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1077
+#: g10/keygen.c:1089
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1085
+#: g10/keygen.c:1097
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1091
+#: g10/keygen.c:1103
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1114
+#: g10/keygen.c:1126
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1120
+#: g10/keygen.c:1132
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1664,29 +1665,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1136
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1129
+#: g10/keygen.c:1141
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1139
+#: g10/keygen.c:1151
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1140
+#: g10/keygen.c:1152
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1159
+#: g10/keygen.c:1171
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1198
+#: g10/keygen.c:1210
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1694,18 +1695,18 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keyedit.c:665 g10/keygen.c:1206
+#: g10/keyedit.c:696 g10/keygen.c:1218
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keygen.c:1207
+#: g10/keygen.c:1219
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1213
+#: g10/keygen.c:1225
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1717,7 +1718,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1234
+#: g10/keygen.c:1246
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1730,53 +1731,53 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:1725
+#: g10/keygen.c:1741
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1779
+#: g10/keygen.c:1795
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:1867 g10/keygen.c:1947
+#: g10/keygen.c:1883 g10/keygen.c:1963
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1868 g10/keygen.c:1949
+#: g10/keygen.c:1884 g10/keygen.c:1965
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1936
+#: g10/keygen.c:1952
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1942
+#: g10/keygen.c:1958
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1963
+#: g10/keygen.c:1979
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1983
+#: g10/keygen.c:1999
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2000
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:1993
+#: g10/keygen.c:2009
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1784,19 +1785,19 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:2005 g10/keygen.c:2111
+#: g10/keygen.c:2021 g10/keygen.c:2127
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2049 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2065 g10/sig-check.c:223 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:2051 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2067 g10/sig-check.c:225 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1804,12 +1805,12 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:2060
+#: g10/keygen.c:2076
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:2087
+#: g10/keygen.c:2103
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
@@ -1828,7 +1829,7 @@ msgstr "`%s' zaten sıkıştırılmış\n"
 msgid "%s: can't open: %s\n"
 msgstr "%s: açılamıyor: %s\n"
 
-#: g10/encode.c:122 g10/sign.c:953
+#: g10/encode.c:122 g10/sign.c:959
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -1894,22 +1895,22 @@ msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2260
+#: g10/getkey.c:187 g10/getkey.c:2271
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1363
+#: g10/getkey.c:1360
 #, fuzzy, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %08lX anahtarı --always-trust kullanılarak geçerli yapılıyor\n"
 
-#: g10/getkey.c:1983
+#: g10/getkey.c:1988
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2024
+#: g10/getkey.c:2035
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
@@ -2023,7 +2024,7 @@ msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
+#: g10/import.c:495 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
@@ -2213,118 +2214,129 @@ msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası eklendi\n"
 msgid "key %08lX: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
 
-#: g10/keyedit.c:139
+#: g10/keyedit.c:140
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:140
+#: g10/keyedit.c:141
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:211
+#: g10/keyedit.c:212
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:213
+#: g10/keyedit.c:214
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:215
+#: g10/keyedit.c:216
 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:217
+#: g10/keyedit.c:218
 #, 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:219
+#: g10/keyedit.c:220
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:222
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:224
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:226
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:325
-#, c-format
-msgid "User ID \"%s\" is revoked.\n"
+#: g10/keyedit.c:333
+#, fuzzy, c-format
+msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1014
-msgid "Are you sure you still want to sign it?\n"
-msgstr "Onu yine de imzalamak istiyor musunuz?\n"
+#: g10/keyedit.c:341 g10/keyedit.c:424 g10/keyedit.c:476 g10/keyedit.c:1048
+#, fuzzy
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Onu yine de eklemek istiyor musunuz? (e/h)"
 
-#: g10/keyedit.c:335 g10/keyedit.c:529 g10/keyedit.c:1017
-msgid "Really sign? "
-msgstr "Gerçekten imzalayacak mısınız? "
+#: g10/keyedit.c:348 g10/keyedit.c:430 g10/keyedit.c:1054
+msgid "  Unable to sign.\n"
+msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:352
-#, c-format
+#: g10/keyedit.c:362
+#, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
+msgstr ""
+"\"%s\" üzerindeki imzanız\n"
+"dahili bir imza.\n"
 "\n"
-"Do you want to promote it to a full exportable signature?\n"
+"Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz?\n"
+
+#: g10/keyedit.c:366
+#, fuzzy
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 "\n"
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz?\n"
 
-#: g10/keyedit.c:379
+#: g10/keyedit.c:386
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%1$s\" zaten %3$08lX anahtarıyla %2$s-imzalı\n"
 
-#: g10/keyedit.c:384
-#, c-format
-msgid "\"%s\" was already %ssigned by key %08lX\n"
+#: g10/keyedit.c:391
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%1$s\" zaten %3$08lX anahtarıyla %2$s-imzalı\n"
 
-#: g10/keyedit.c:396
+#: g10/keyedit.c:403
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:411
+#: g10/keyedit.c:418
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:415
-msgid "  Are you sure you still want to sign it?\n"
-msgstr "  Onu yine de imzalamak istiyor musunuz?\n"
-
-#: g10/keyedit.c:418
-#, fuzzy
-msgid "Really sign? (y/N) "
-msgstr "Gerçekten imzalayacak mısınız? "
-
-#: g10/keyedit.c:429
+#: g10/keyedit.c:436
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#. Should this default to yes? -ds
-#: g10/keyedit.c:432
+#: g10/keyedit.c:440
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (y/N) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (e/h) "
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
+#, fuzzy
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
+
+#: g10/keyedit.c:471
+#, fuzzy
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "bu ileti PGP 2.x tarafından kullanılamayabilir\n"
+
+#: g10/keyedit.c:492
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2333,27 +2345,27 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:496
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:466
+#: g10/keyedit.c:498
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:468
+#: g10/keyedit.c:500
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:470
+#: g10/keyedit.c:502
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:495
+#: g10/keyedit.c:527
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2361,7 +2373,7 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:504
+#: g10/keyedit.c:536
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2369,7 +2381,7 @@ msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:508
+#: g10/keyedit.c:540
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2377,7 +2389,7 @@ msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:513
+#: g10/keyedit.c:545
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2385,7 +2397,7 @@ msgstr ""
 "\n"
 "Her şeyiyle bu anahtarı kontol edemedim.\n"
 
-#: g10/keyedit.c:517
+#: g10/keyedit.c:549
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2393,7 +2405,7 @@ msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:521
+#: g10/keyedit.c:553
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2401,29 +2413,33 @@ msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:562 g10/keyedit.c:2489 g10/keyedit.c:2551 g10/sign.c:273
+#: g10/keyedit.c:561
+msgid "Really sign? "
+msgstr "Gerçekten imzalayacak mısınız? "
+
+#: g10/keyedit.c:594 g10/keyedit.c:2570 g10/keyedit.c:2632 g10/sign.c:279
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:622
+#: g10/keyedit.c:653
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:657
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:630
+#: g10/keyedit.c:661
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:650
+#: g10/keyedit.c:681
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:656
+#: g10/keyedit.c:687
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2431,7 +2447,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:670
+#: g10/keyedit.c:701
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2439,447 +2455,454 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:704
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:768
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:810
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:811
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:812
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "help"
 msgstr "yardım"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:813
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:815
 msgid "show fingerprint"
 msgstr "parmak izini göster"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:816
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini göster"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:817
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:818
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:819
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:820
 msgid "list signatures"
 msgstr "imzaları listele"
 
-#: g10/keyedit.c:789
+#: g10/keyedit.c:821
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:790
+#: g10/keyedit.c:822
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:823
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:824
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "nrsign"
 msgstr "yksızimza"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:825
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "nrlsign"
 msgstr "içyksızimza"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:826
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan dahili imza"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:827
 msgid "debug"
 msgstr "hata ayıklama"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:828
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "addphoto"
 msgstr "fotoekle"
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:829
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:830
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:800
+#: g10/keyedit.c:832
 msgid "delphoto"
 msgstr "fotosil"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:833
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:834
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:835
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "expire"
 msgstr "sontarih"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:836
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "primary"
 msgstr "asıl"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:837
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle"
 msgstr "seçmece"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:838
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:840
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "pref"
 msgstr "önayar"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:841
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "showpref"
 msgstr "tercihgöst"
 
-#: g10/keyedit.c:810
+#: g10/keyedit.c:842
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "setpref"
 msgstr "tercihyap"
 
-#: g10/keyedit.c:811
+#: g10/keyedit.c:843
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updpref"
 msgstr "tercgüncel"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:844
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:813
+#: g10/keyedit.c:845
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "trust"
 msgstr "güvence"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:846
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revsig"
 msgstr "imzayürkal"
 
-#: g10/keyedit.c:815
+#: g10/keyedit.c:847
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revkey"
 msgstr "yürkalanh"
 
-#: g10/keyedit.c:816
+#: g10/keyedit.c:848
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable"
 msgstr "iptal"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:849
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:850
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "showphoto"
 msgstr "fotogöst"
 
-#: g10/keyedit.c:819
+#: g10/keyedit.c:851
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:112 g10/keyedit.c:839
+#: g10/delkey.c:112 g10/keyedit.c:871
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:876
+#: g10/keyedit.c:908
 #, 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:894
+#: g10/keyedit.c:926
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:925
+#: g10/keyedit.c:957
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:989
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:993
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1010
-msgid "Key is revoked.\n"
+#: g10/keyedit.c:1042
+#, fuzzy
+msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı.\n"
 
-#: g10/keyedit.c:1026
+#: g10/keyedit.c:1061
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1027
+#: g10/keyedit.c:1062
 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:1052
+#: g10/keyedit.c:1087
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1072 g10/keyedit.c:1093
+#: g10/keyedit.c:1107 g10/keyedit.c:1128
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1074
+#: g10/keyedit.c:1109
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1077
+#: g10/keyedit.c:1112
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1078
+#: g10/keyedit.c:1113
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1116 g10/keyedit.c:1138
+#: g10/keyedit.c:1151 g10/keyedit.c:1173
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1120
+#: g10/keyedit.c:1155
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1121
+#: g10/keyedit.c:1156
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1142
+#: g10/keyedit.c:1177
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1143
+#: g10/keyedit.c:1178
 msgid "Do you really want to revoke this key? "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1207
+#: g10/keyedit.c:1244
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1209
+#: g10/keyedit.c:1246
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1284
 msgid "Save changes? "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1250
+#: g10/keyedit.c:1287
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1261
+#: g10/keyedit.c:1298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1305
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1275
+#: g10/keyedit.c:1312
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1323
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1480
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1483
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:1442 g10/keyedit.c:1468
+#: g10/keyedit.c:1488 g10/keyedit.c:1514
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1497
 #, c-format
 msgid " trust: %c/%c"
 msgstr " güven derecesi: %c/%c"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1501
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:1484
+#: g10/keyedit.c:1530
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
 
-#: g10/keyedit.c:1487
+#: g10/keyedit.c:1533
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1535
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1565
+msgid ""
+"Please note that the shown key validity is not necessary correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:1651
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2888,16 +2911,16 @@ msgstr ""
 "    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz "
 "olabilir.\n"
 
-#: g10/keyedit.c:1603 g10/keyedit.c:1630
+#: g10/keyedit.c:1655 g10/keyedit.c:1682
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/h)"
 
-#: g10/keyedit.c:1611
+#: g10/keyedit.c:1663
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
 
-#: g10/keyedit.c:1625
+#: g10/keyedit.c:1677
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2906,83 +2929,83 @@ 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:1636
+#: g10/keyedit.c:1688
 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:1767
+#: g10/keyedit.c:1819
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1823
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1827
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1781
+#: g10/keyedit.c:1833
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:1795
+#: g10/keyedit.c:1847
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1848
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1851
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1920
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1926
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:1878
+#: g10/keyedit.c:1930
 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:1880
+#: g10/keyedit.c:1932
 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:1922
+#: g10/keyedit.c:1974
 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:1938
+#: g10/keyedit.c:1990
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2019
+#: g10/keyedit.c:2072
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2194
+#: g10/keyedit.c:2260
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2240
+#: g10/keyedit.c:2306
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2339
+#: g10/keyedit.c:2420
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2425
 #, c-format
 msgid ""
 "\"\n"
@@ -2991,7 +3014,7 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2428
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3000,66 +3023,71 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2433
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2437
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/h)"
 
-#: g10/keyedit.c:2360
+#: g10/keyedit.c:2441
 #, fuzzy
 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)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2386
+#: g10/keyedit.c:2467
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2481
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2489
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:2428
+#: g10/keyedit.c:2509
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2519
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2440
+#: g10/keyedit.c:2521
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2528
 #, fuzzy
 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:2477
+#: g10/keyedit.c:2558
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
+#: g10/keyedit.c:2710
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr ""
+
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
+#: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:721 g10/mainproc.c:730
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
@@ -3077,7 +3105,7 @@ msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
 #. of subkey
-#: g10/keylist.c:387 g10/mainproc.c:852
+#: g10/keylist.c:387 g10/mainproc.c:856
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
@@ -3166,72 +3194,72 @@ msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:668
+#: g10/mainproc.c:672
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:729
+#: g10/mainproc.c:733
 msgid "Notation: "
 msgstr "Niteleme: "
 
-#: g10/mainproc.c:741
+#: g10/mainproc.c:745
 msgid "Policy: "
 msgstr "Güvence: "
 
-#: g10/mainproc.c:1194
+#: g10/mainproc.c:1198
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1236 g10/mainproc.c:1246
+#: g10/mainproc.c:1240 g10/mainproc.c:1250
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1257
+#: g10/mainproc.c:1261
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s imzası, %s anahtarı ve %08lX kullanıcı kimliği ile yapıldı\n"
 
-#: g10/mainproc.c:1293 g10/mainproc.c:1316
+#: g10/mainproc.c:1305 g10/mainproc.c:1327
 msgid "BAD signature from \""
 msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1294 g10/mainproc.c:1317
+#: g10/mainproc.c:1306 g10/mainproc.c:1328
 msgid "Expired signature from \""
 msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1295 g10/mainproc.c:1318
+#: g10/mainproc.c:1307 g10/mainproc.c:1329
 msgid "Good signature from \""
 msgstr "Doğru imza: \""
 
-#: g10/mainproc.c:1320
+#: g10/mainproc.c:1331
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1340
+#: g10/mainproc.c:1351
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1400
+#: g10/mainproc.c:1412
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1469 g10/mainproc.c:1485 g10/mainproc.c:1547
+#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1508
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1553
+#: g10/mainproc.c:1565
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1560
+#: g10/mainproc.c:1572
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -3276,7 +3304,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1047
+#: g10/parse-packet.c:1053
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -3490,42 +3518,46 @@ msgstr "gizli anahtar parçaları kullanım dışı\n"
 msgid "protection algorithm %d%s is not supported\n"
 msgstr "koruma algoritması %d%s desteklenmiyor\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:215
 msgid "Invalid passphrase; please try again"
 msgstr "Anahtar parolası geçersiz; lütfen tekrar deneyin"
 
-#: g10/seckey-cert.c:187
+#: g10/seckey-cert.c:216
 #, c-format
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-#: g10/seckey-cert.c:244
+#: g10/seckey-cert.c:273
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
 "değiştirin.\n"
 
-#: g10/sig-check.c:209
+#: g10/seckey-cert.c:311
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr ""
+
+#: g10/sig-check.c:205
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
 
-#: g10/sig-check.c:217
+#: g10/sig-check.c:213
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:218
+#: g10/sig-check.c:214
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:240
+#: g10/sig-check.c:237
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "BİLGİ: %08lX imza anahtarının kullanım süresi %s tarihinde dolmuş\n"
 
-#: g10/sig-check.c:312
+#: g10/sig-check.c:318
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "Hatalı imzanın bilinmeyen bir kritik bitten kaynaklandığı sanılıyor\n"
 
@@ -3537,40 +3569,40 @@ msgstr ""
 "UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:268
+#: g10/sign.c:274
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:277
+#: g10/sign.c:283
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s imza: %s den\n"
 
-#: g10/sign.c:424
+#: g10/sign.c:430
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/sign.c:612
+#: g10/sign.c:618
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
 
-#: g10/sign.c:637 g10/sign.c:806
+#: g10/sign.c:643 g10/sign.c:812
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/sign.c:698
+#: g10/sign.c:704
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:790
+#: g10/sign.c:796
 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 imza yapabilirsiniz\n"
 
-#: g10/sign.c:947
+#: g10/sign.c:953
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -3585,12 +3617,12 @@ msgstr "%d karakterden daha uzun metin satırları okunamıyor\n"
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1380
+#: g10/tdbio.c:121 g10/tdbio.c:1382
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1387
+#: g10/tdbio.c:127 g10/tdbio.c:1389
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
@@ -3654,131 +3686,131 @@ msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:670 g10/tdbio.c:699
-#: g10/tdbio.c:1313 g10/tdbio.c:1340
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:634 g10/tdbio.c:679
+#: g10/tdbio.c:634 g10/tdbio.c:680
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1117
+#: g10/tdbio.c:1119
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1125
+#: g10/tdbio.c:1127
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1146
+#: g10/tdbio.c:1148
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1163
+#: g10/tdbio.c:1165
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1168
+#: g10/tdbio.c:1170
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1346
+#: g10/tdbio.c:1348
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1354
+#: g10/tdbio.c:1356
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1364
+#: g10/tdbio.c:1366
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1394
+#: g10/tdbio.c:1396
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1441
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
-#: g10/trustdb.c:202
+#: g10/trustdb.c:200
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' geçerli bir anahtar kimliği değil\n"
 
-#: g10/trustdb.c:237
+#: g10/trustdb.c:235
 #, c-format
 msgid "key %08lX: accepted as trusted key\n"
 msgstr "%08lX anahtarı: güvenli anahtar olarak kabul edildi\n"
 
-#: g10/trustdb.c:276
+#: g10/trustdb.c:274
 #, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
 msgstr "%08lX anahtarı güvence veritabanında birden fazla kayıtta bulundu\n"
 
-#: g10/trustdb.c:292
+#: g10/trustdb.c:290
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr "%08lX anahtarı: güvenli anahtar için genel anahtar yok - atlandı\n"
 
-#: g10/trustdb.c:334
+#: g10/trustdb.c:332
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "güvence veritabanı kaydı %lu, istek tipi %d: okuma başarısız: %s\n"
 
-#: g10/trustdb.c:340
+#: g10/trustdb.c:338
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "güvence veritabanının %lu. kaydı %d istek türünde değil\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:353
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
 
-#: g10/trustdb.c:370
+#: g10/trustdb.c:368
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/trustdb.c:470
+#: g10/trustdb.c:468
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:476 g10/trustdb.c:1488
+#: g10/trustdb.c:474 g10/trustdb.c:1638
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:709
+#: g10/trustdb.c:776
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:860
+#: g10/trustdb.c:930
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "%08lX genel anahtarı yok: %s\n"
 
-#: g10/trustdb.c:1363
+#: g10/trustdb.c:1512
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 
-#: g10/trustdb.c:1441
+#: g10/trustdb.c:1590
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -3893,6 +3925,10 @@ msgstr ""
 "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
 "denendi!\n"
 
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr ""
+
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "önceden belirlenmiş işlemler kipinde \"--yes\" olmaksızın yapılamaz\n"
@@ -3910,12 +3946,16 @@ msgstr "Bu bir gizli anahtar! - gerçekten silinecek mi? "
 msgid "deleting keyblock failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/delkey.c:185
+#: g10/delkey.c:161
+msgid "ownertrust information cleared\n"
+msgstr ""
+
+#: g10/delkey.c:189
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 
-#: g10/delkey.c:187
+#: g10/delkey.c:191
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
@@ -4320,6 +4360,16 @@ msgstr "%lu anahtar denetlendi (%lu imza)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
+#~ msgid "Are you sure you still want to sign it?\n"
+#~ msgstr "Onu yine de imzalamak istiyor musunuz?\n"
+
+#~ msgid "  Are you sure you still want to sign it?\n"
+#~ msgstr "  Onu yine de imzalamak istiyor musunuz?\n"
+
+#, fuzzy
+#~ msgid "Really sign? (y/N) "
+#~ msgstr "Gerçekten imzalayacak mısınız? "
+
 #~ msgid "key %08lX: our copy has no self-signature\n"
 #~ msgstr "anahtar %08lX: bizim kopyanın öz-imzası yok\n"