about to release 1.2.3rc1

31 files changed, 20328 insertions, 13617 deletions

diff --git a/AUTHORS b/AUTHORS
index 3d9b7f802..f53645815 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,8 @@ Jedi Lin <[email protected]> Translations [zh-tw]
 
 Jouni Hiltunen <[email protected]> Translations [fi]
 
+Laurentiu Buzdugan <[email protected]> Translations [ro]
+
 Magda Procha'zkova'  <[email protected]> Translations [cs]
 
 Michael Anckaert <[email protected]> *** [nl]
diff --git a/ChangeLog b/ChangeLog
index 17a0af15d..000999302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-19  Werner Koch  <[email protected]>
+
+        Released 1.2.3rc1.
+	
+	* configure.ac (ALL_LINGUAS): Added Romanian
+
 2003-06-18  David Shaw  <[email protected]>
 
 	* NEWS: Note portability changes.
diff --git a/NEWS b/NEWS
index b0ebe52f1..6ef722a33 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ Noteworthy changes in version 1.2.3 (unreleased)
     * A number of portability changes to make building GnuPG on
       less-common platforms easier.
 
+    * Romanian translation.
+
 
 Noteworthy changes in version 1.2.2 (2003-05-01)
 ------------------------------------------------
diff --git a/THANKS b/THANKS
index 2a1eee61a..6912a374f 100644
--- a/THANKS
+++ b/THANKS
@@ -104,6 +104,7 @@ Johnny Teve�en		   [email protected]
 J�rg Schilling		   [email protected]
 Jos Backus		   [email protected]
 Joseph Walton              [email protected]
+Juan F. Codagnone          [email protected]
 Jun Kuriyama		   [email protected]
 Kahil D. Jallad            [email protected]
 Karl Fogel		   [email protected]
diff --git a/configure.ac b/configure.ac
index 1283163f7..1b04ed9a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,13 @@ AC_PREREQ(2.52)
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.2.3-cvs, [email protected])
+AC_INIT(gnupg, 1.2.3rc1, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
 development_version=no
 
-ALL_LINGUAS="ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt sk sv tr zh_TW"
+ALL_LINGUAS="ca cs da de eo el es et fi fr gl hu id it ja nl pl pt_BR pt ro sk sv tr zh_TW"
 
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(g10/g10.c)
diff --git a/doc/gpg.texi b/doc/gpg.texi
index fbedb8f33..970dcc4b8 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -779,12 +779,11 @@ useful when you're listing a specific key or set of keys. It has no
 effect when listing all keys.
 
 @item ---keyring @code{file}
-Add @code{file} to the list of keyrings.
-If @code{file} begins with a tilde and a slash, these
-are replaced by the HOME directory. If the filename
-does not contain a slash, it is assumed to be in the
-home-directory ("~/.gnupg" if ---homedir is not used).
-The filename may be prefixed with a scheme:
+Add @code{file} to the list of keyrings. If @code{file} begins with a
+tilde and a slash, these are replaced by the HOME directory. If the
+filename does not contain a slash, it is assumed to be in the GnuPG
+home directory ("~/.gnupg" if ---homedir is not used). The filename
+may be prefixed with a scheme:
 
 "gnupg-ring:" is the default one.
 
@@ -793,6 +792,12 @@ It might make sense to use it together with ---no-default-keyring.
 @item ---secret-keyring @code{file}
 Same as ---keyring but for the secret keyrings.
 
+@item ---trustdb-name @code{file}
+Use @code{file} instead of the default trustdb. If @code{file} begins
+with a tilde and a slash, these are replaced by the HOME directory. If
+the filename does not contain a slash, it is assumed to be in the
+GnuPG home directory ("~/.gnupg" if ---homedir is not used).
+
 @item ---homedir @code{directory}
 Set the name of the home directory to @code{directory} If this
 option is not used it defaults to "~/.gnupg". It does
@@ -885,11 +890,12 @@ text signatures or armor headers. ---no-sk-comments disables this
 option.
 
 @item ---no-comment
-See ---sk-comments. This option is deprecated and may be removed soon.
+See ---no-sk-comments. This option is deprecated and may be removed
+soon.
 
 @item ---comment @code{string}
-Use @code{string} as comment string in clear text signatures.
-The default is not do write a comment string.
+Use @code{string} as the comment string in clear text signatures. The
+default behavior is not to use a comment string.
 
 @item ---default-comment
 Force to write the standard comment string in clear
@@ -904,7 +910,7 @@ Force inclusion of the version string in ASCII armored output.
 
 @item ---sig-notation @code{name=value}
 @itemx ---cert-notation @code{name=value}
-@itemx -N, ---notation-data @code{name=value}
+@itemx -N, ---set-notation @code{name=value}
 Put the name value pair into the signature as notation data.
 @code{name} must consist only of printable characters or spaces, and
 must contain a '@@' character. This is to help prevent pollution of
@@ -914,7 +920,7 @@ encoded in UTF8, so you should check that your ---charset is set
 correctly. If you prefix @code{name} with an exclamation mark, the
 notation data will be flagged as critical (rfc2440:5.2.3.15).
 ---sig-notation sets a notation for data signatures. --cert-notation
-sets a notation for key signatures (certifications). ---notation-data
+sets a notation for key signatures (certifications). ---set-notation
 sets both.
 
 There are special codes that may be used in notation names. "%k" will
@@ -938,7 +944,7 @@ Use @code{string} as Policy URL for signatures (rfc2440:5.2.3.19). If
 you prefix it with an exclamation mark, the policy URL packet will be
 flagged as critical. ---sig-policy-url sets a a policy url for data
 signatures. ---cert-policy-url sets a policy url for key signatures
-(certifications). -set-policy-url sets both.
+(certifications). ---set-policy-url sets both.
 
 The same %-expandos used for notation data are available here as well.
 
@@ -949,8 +955,9 @@ as when verifying a signature with a policy URL in it.
 ---no-show-policy-url disables this option.
 
 @item ---set-filename @code{string}
-Use @code{string} as the name of file which is stored in
-messages.
+Use @code{string} as the filename which is stored inside messages.
+This overrides the default, which is to use the actual filename of the
+file being encrypted.
 
 @item ---for-your-eyes-only
 @itemx ---no-for-your-eyes-only
@@ -1111,25 +1118,45 @@ option.
 Override the value of the environment variable
 @samp{GPG_AGENT_INFO}. This is only used when ---use-agent has been given
 
+@item Compliance options
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of
+this is nearly always the correct one. See the INTEROPERABILITY WITH
+OTHER OPENPGP PROGRAMS section below before using one of these
+options.
+
+@table @asis
+@item ---gnupg
+Use standard GnuPG behavior. This is essentially OpenPGP behavior
+(see ---openpgp), but with some additional workarounds for common
+compatibility problems in different versions of PGP. This is the
+default option, so it is not generally needed, but it may be useful to
+override a different compliance option in the gpg.conf file.
+
+@item ---openpgp
+Reset all packet, cipher and digest options to strict OpenPGP
+behavior. Use this option to reset all previous options like
+---rfc1991, --force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
+---compress-algo to OpenPGP compliant values. All PGP workarounds are
+disabled.
+
 @item ---rfc1991
-Try to be more RFC1991 (PGP 2.x) compliant.
+Try to be more RFC-1991 (PGP 2.x) compliant.
 
 @item ---pgp2
-@itemx ---no-pgp2
 Set up all options to be as PGP 2.x compliant as possible, and warn if
 an action is taken (e.g. encrypting to a non-RSA key) that will create
 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 --disable-mdc
----no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs
+This option implies `---rfc1991 --disable-mdc --no-force-v4-certs
+---no-sk-comment --escape-from-lines --force-v3-sigs
 ---no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA
 ---digest-algo MD5 --compress-algo 1'. It also disables --textmode
-when encrypting. ---no-pgp2 disables this option.
+when encrypting.
 
 @item ---pgp6
-@itemx ---no-pgp6
 Set up all options to be as PGP 6 compliant as possible. This
 restricts you to the ciphers IDEA (if the IDEA plugin is installed),
 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160, and the
@@ -1137,32 +1164,23 @@ compression algorithms none and ZIP. This also disables
 ---throw-keyid, and making signatures with signing subkeys as PGP 6
 does not understand signatures made by signing subkeys.
 
-This option implies `---disable-mdc --no-comment --escape-from-lines
----force-v3-sigs --no-ask-sig-expire --compress-algo 1' --no-pgp6
-disables this option.
+This option implies `---disable-mdc --no-sk-comment --escape-from-lines
+---force-v3-sigs --no-ask-sig-expire'
 
 @item ---pgp7
-@itemx ---no-pgp7
 Set up all options to be as PGP 7 compliant as possible. This is
 identical to ---pgp6 except that MDCs are not disabled, and the list of
 allowable ciphers is expanded to add AES128, AES192, AES256, and
-TWOFISH. ---no-pgp7 disables this option.
+TWOFISH.
 
 @item ---pgp8
-@itemx ---no-pgp8
 Set up all options to be as PGP 8 compliant as possible. PGP 8 is a
 lot closer to the OpenPGP standard than previous versions of PGP, so
-all this does is disable ---throw-keyid and set --escape-from-lines and
----compress-algo 1. The allowed algorithms list is the same as --pgp7
-with the addition of the SHA-256 digest algorithm. ---no-pgp8 disables
-this option.
+all this does is disable ---throw-keyid and set --escape-from-lines.
+The allowed algorithms list is the same as ---pgp7 with the addition of
+the SHA-256 digest algorithm.
 
-@item ---openpgp
-Reset all packet, cipher and digest options to OpenPGP behavior. Use
-this option to reset all previous options like ---rfc1991,
----force-v3-sigs, --s2k-*, --cipher-algo, --digest-algo and
----compress-algo to OpenPGP compliant values. All PGP workarounds and
----pgpX modes are also disabled.
+@end table
 
 @item ---force-v3-sigs
 @itemx ---no-force-v3-sigs
@@ -1203,15 +1221,17 @@ it does not ensure the de-facto standard format of user IDs.
 
 @item ---ignore-time-conflict
 GnuPG normally checks that the timestamps associated with keys and
-signatures have plausible values. However, sometimes a signature seems to
-be older than the key due to clock problems. This option makes these
-checks just a warning.
+signatures have plausible values. However, sometimes a signature
+seems to be older than the key due to clock problems. This option
+makes these checks just a warning. See also ---ignore-valid-from for
+timestamp issues on subkeys.
 
 @item ---ignore-valid-from
-GnuPG normally does not select and use subkeys created in the future. This
-option allows the use of such keys and thus exhibits the pre-1.0.7
-behaviour. You should not use this option unless you there is some
-clock problem.
+GnuPG normally does not select and use subkeys created in the future.
+This option allows the use of such keys and thus exhibits the
+pre-1.0.7 behaviour. You should not use this option unless you there
+is some clock problem. See also ---ignore-time-conflict for timestamp
+issues with signatures.
 
 @item ---ignore-crc-error
 The ASCII armor used by OpenPGP is protected by a CRC checksum against
@@ -1260,11 +1280,17 @@ Suppress the initial copyright message.
 Suppress the warning about "using insecure memory".
 
 @item ---no-permission-warning
-Suppress the warning about unsafe file permissions. Note that the
-file permission checks that GnuPG performs are not intended to be
-authoritative, rather they simply warn about certain common permission
-problems. Do not assume that the lack of a warning means that your
-system is secure.
+Suppress the warning about unsafe file and home directory (---homedir)
+permissions. Note that the permission checks that GnuPG performs are
+not intended to be authoritative, but rather they simply warn about
+certain common permission problems. Do not assume that the lack of a
+warning means that your system is secure.
+
+Note that the warning for unsafe ---homedir permissions cannot be
+supressed in the gpg.conf file, as this would allow an attacker to
+place an unsafe gpg.conf file in place, and use this file to supress
+warnings about itself. The ---homedir permissions warning may only be
+supressed on the command line.
 
 @item ---no-mdc-warning
 Suppress the warning about missing MDC integrity protection.
diff --git a/po/ChangeLog b/po/ChangeLog
index 5ead4974a..bf1a782f1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-19  Werner Koch  <[email protected]>
+
+	* ca.po, de.po, es.po, et.po, ja.po, ro.po, tr.po, zh_TW.po:
+	Updated from TP robot.
+
 2003-05-01  Werner Koch  <[email protected]>
 
 	* de.po: Added recent translatable strings and fixed fuzzies.
diff --git a/po/ca.po b/po/ca.po
index c0e2d0d55..c7eded233 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -26,8 +26,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-04-27 19:51+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-14 18:29+0200\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -69,14 +69,14 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "ix"
 
 # �xX�?  ivb
 #: util/miscutil.c:336
 msgid "qQ"
-msgstr "qQ"
+msgstr "xX"
 
 #: util/errors.c:54
 msgid "general error"
@@ -305,64 +305,64 @@ msgstr "... a�� �s un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "heu trobat un bug... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir �%s�: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de �%s�: %s\n"
 
 # Descartar, deixar passar...  ignorar �s un anglicisme.  ivb
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "�%s� no �s un fitxer regular: es descarta\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed �s buit\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AV�S: el tamany del fitxer random_seed no �s v�lid - no s'usar�\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir �%s�: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure �%s�: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar �%s�: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AV�S: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -392,6 +392,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -401,7 +406,7 @@ msgstr ""
 "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
 "vos ajuda no avorrir-vos, ja que ajudar� a la qualitat de la entropia.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -409,166 +414,166 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[fitxers]|xifra fitxers"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "xifra nom�s amb xifratge sim�tric"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "nom�s emmagatzema"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[fitxers]|desxifra fitxers"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # �de les claus� o �de la clau�?  ivb
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # �dactilars� o �digitals�?  ivb
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell p�blic"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "signa una clau irrevocablement"
 
 # D'altres formes o no queda clar o �s massa literari :P  ivb
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "signa una clau de forma local i irrevocable"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocaci�"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "llista nom�s la seq��ncia de paquets"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta els valors de confian�a"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa els valors de confian�a"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confian�a"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualitzaci� no atesa de la base de dades de confian�a"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de dades de confian�a corrompuda"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "lleva l'armadura a un fitxer o a stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armadura d'un fitxer o d'stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -578,205 +583,205 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la clau predeterminada com a destinatari predeterminat"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressi� N (0 no comprimeix)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa el mode de text can�nic"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos �s en la llista d'opcions amb --help. Urgh. jm
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detall"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "una mica m�s silenci�s"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "for�a signatures v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "no for�a signatures v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "for�a signatures de clau v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "no for�a signatures de clau v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "sempre utilitza un MDC per a xifrar"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "mai utilitza un MDC per a xifrar"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "utilitza el gpg-agent"
 
 # Mode desat�s (SC)  ivb
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "mode desat�s: no pregunta mai"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "suposa �s�� en la majoria de les preguntes"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "suposa �no� en la majoria de les preguntes"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "afegeix aquest anell secret a la llista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "mostra en quin anell de claus est� una clau llistada"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|el joc de car�cters ser� NOM"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "llig opcions del fitxer"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informaci� d'estat en aquest FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|fitxer|escriu informaci� d'estat en un fitxer"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCLAU|confia absolutament en aquesta clau"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FITXER|carrega el m�dul d'extensi� especificat"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el mode descrit en RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "estableix totes les opcions de paquets, xifratge i resum al comportament "
 "d'OpenPGP"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "estableix totes les opcions de paquets, xifratge i resum al comportament de "
 "PGP 2.x"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM per a les contrasenyes"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritme de compressi� N"
 
 # elimina o descarta? jm
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta el camp keyid dels paquets xifrats"
 
 # FIXME: uncapitalize
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "mostra els Photo ID"
 
 # FIXME: uncapitalize
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "no mostra els Photo ID"
 
 # FIXME: uncapitalize
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "fixa l'ordre per a veure Photo ID"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -787,7 +792,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. s�n noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory m�s endavant. Els deixe com a l'original. jm
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -807,15 +812,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -827,7 +832,10 @@ msgstr ""
 
 # Suportats? ivb
 # A Softcatal� diuen molt �implementat�. jm
-#: g10/g10.c:652
+# Precissament acabem de parlar d'�implementat a la llista del GNOME
+# i s'ha dit que �s erroni, igual que �suportat� :) Les alternatives
+# encara no m'agraden massa... jm
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -835,323 +843,357 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Clau p�blica: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Dispersi�: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compressi�: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "forma d'�s: gpg [opcions] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no s'ha trobat cap signe = en la definici� de grup �%s�\n"
 
 # Indi. ivb
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AV�S: el propietari �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AV�S: els permissos s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AV�S: el propietari del directori envoltant �s insegur en %s �%s�\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AV�S: els permissos del directori envoltant s�n insegurs en %s �%s�\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic �%s�\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensi� de xifrat �%s� no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "no s'ha pogut analitzar sint�cticament la URI del servidor de claus\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanci� no v�lides\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "AV�S: el programa podria crear un fitxer core!\n"
 
 # FIXME: prefer�ncia? jm
 # Ho discut�rem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s t� prefer�ncia sobre %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no �s per a �s normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no �s perm�s amb %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nom�s podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "aquest missatge pot no ser usable per %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritme de compressi� ha d'estar en l'interval %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no �s gens recomanable\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K �s inv�lid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level �s inv�lid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "no podeu usar %s mentre esteu en mode %s\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confian�a: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau p�blica\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "La generaci� de claus ha fallat: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "La generaci� de claus ha fallat: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: ha fallat search_record: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir �%s�\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1159,19 +1201,19 @@ msgstr ""
 "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i acabar "
 "amb el signe �=�\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notaci� d'usuari no pot contenir el car�cter �@�\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci� no pot utilitzar cap car�cter de control\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de pol�tica de certificaci� donada no �s v�lida\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
 
@@ -1316,7 +1358,7 @@ msgstr ""
 "No hi ha cap valor de confian�a assignat a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "              alias \""
 
@@ -1373,7 +1415,7 @@ msgstr " o = omet aquesta clau\n"
 msgid " q = quit\n"
 msgstr " x = ix\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "La vostra decisi�? "
 
@@ -1628,7 +1670,7 @@ msgstr "   (%d) RSA (nom�s xifrar)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signar i xifrar)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Seleccioneu: "
 
@@ -1646,7 +1688,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "La selecci� �s inv�lida.\n"
 
@@ -1857,29 +1899,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adre�a ni en el camp *nom* ni en el camp *comentari*\n"
 
 # xX? ivb
 # Hmm... s�. jm
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (X) ix "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Canvia (N)om, (C)omentari, (E)mail o (O) d'acord / (X) ix"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1887,16 +1929,16 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1908,7 +1950,7 @@ msgstr ""
 "useu aquest programa amb l'opci� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1920,56 +1962,56 @@ msgstr ""
 "nombres primers; a�� d�na oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "La generaci� de claus ha estat cancel�lada.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'est� escrivint la clau p�blica a �%s�\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
 # Potser no hi haja cap anell! ivb
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no s'ha trobat cap anell p�blic escrivible: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "s'ha produ�t un error mentre s'escrivia l'anell p�blic �%s�: %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "s'ha produ�t un error mentre s'escrivia l'anell secret �%s�: %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "s'han creat i signat les claus p�blica i secreta.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "s'ha marcat la clau com a de confian�a absoluta.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1977,13 +2019,13 @@ msgstr ""
 "Noteu que aquesta clau no serveix per a xifrar. Potser vulgueu usar l'ordre\n"
 "\"--edit-key\" per a generar una clau secund�ria per a tal prop�sit.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
 # FIXME: Use ngettext. jm
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1992,7 +2034,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # FIXME: use ngettext. jm
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2000,15 +2042,15 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: crear subclaus per a claus v3 no �s conforme amb OpenPGP\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Crear realment? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
@@ -2027,17 +2069,17 @@ msgstr "error en la creaci� de la contrasenya: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no es pot usar un paquet asim�tric ESK al estar en mode S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "�%s� ja est� comprimida\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AV�S: el fitxer �s buit\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "nom�s podeu xifrar a claus RSA de 2048 bits o menys en el mode --pgp2\n"
@@ -2054,13 +2096,13 @@ msgstr ""
 "no s'ha pogut utilitzar el xifratge IDEA per a totes les claus per a les que "
 "esteu xifrant.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del destinatari\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2072,297 +2114,298 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: �%s�\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clau %08lX: no �s una clau rfc2440 - es descarta\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clau %08lX: no est� protegida - es descarta\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
+msgstr "AV�S: la clau secreta %08lX no te una simple suma de comprovaci� SK\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "AV�S: no s'ha exportat res\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la mem�ria cau de claus p�bliques - desactivada\n"
 
 #. 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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau inv�lida %08lX s'ha fet v�lida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "hi ha una clau secreta per a la clau p�blica �%s�!\n"
+msgstr ""
+"no hi ha una clau secreta per a la subclau p�blica %08lX - es descarta\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "s'usar� la clau secund�ria %08lX en lloc de la prim�ria %08lX\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau p�blica - es descarta\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
 # FIXME: typo Elgamal vs. ElGamal
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTA: s'ha detectat una clau prim�ria ElGamal - a�� pot trigar un temps en "
 "importar-se\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada �%s�\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no �s v�lid\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "a�� pot ser causat per l'abs�ncia d'autosignatura\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau p�blica: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'est� escrivint en �%s�\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau p�blica �%s�\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra c�pia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: �%s� 1 ID d'usuari nou\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: �%s� %d ID d'usuari nous\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: �%s� 1 signatura nova\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: �%s� %d signatures noves\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: �%s� 1 subclau nova\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: �%s� %d subclaus noves\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clau %08lX: �%s� no ha estat modificada\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no v�lid - es descarta\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2372,22 +2415,22 @@ msgstr ""
 # O �rebutjara�? ivb
 # Per tots els canvis d'anglicisme �ignorat� -> �es descarta�,
 # �es rebutja� est� b�. jm
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocaci� �s inv�lid: %s: es rebutja\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
@@ -2395,22 +2438,22 @@ msgstr ""
 "s�\n"
 "\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no �s v�lida en l'id d'usuari �%s�\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau p�blica no �s suportat\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
@@ -2418,17 +2461,17 @@ msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enlla� de subclau m�ltiple\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocaci�\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
@@ -2436,17 +2479,17 @@ msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocaci� m�ltiples\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
@@ -2455,61 +2498,61 @@ msgstr "clau %08lX: es descarta la subclau\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clau %08lX: la signatura �s inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocaci� �s en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocaci� �s inv�lid: %s - es descarta\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau �s en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura �s inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: s'adquireix la clau de revocaci� %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "AV�S: la clau %08lX pot estar revocada: la clau de revocaci� %08lX no est� "
 "present.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocaci� �%s�\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@ -2563,22 +2606,29 @@ msgstr "Han estat detectats %d IDs sense autosignatura v�lida\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari �%s� est� revocat."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "L'ID d'usuari �%s� est� revocat."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AV�S: l'ID d'usuari �%s� no est� autosignat\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2587,11 +2637,11 @@ msgstr ""
 "La vostra signatura en �%s�\n"
 "�s una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2600,13 +2650,13 @@ msgstr ""
 "La vostra signatura actual en �%s�\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reempla�ar la caducada? (s/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2615,54 +2665,54 @@ msgstr ""
 "La vostra signatura en �%s�\n"
 "�s una signatura local.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "�%s� ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "�%s� ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducar� el %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "A�� inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2672,31 +2722,31 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu qu� \n"
 "contestar, entreu �0�.\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (predeterminat)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2704,7 +2754,7 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2712,7 +2762,7 @@ msgstr ""
 "\n"
 "A�� ser� una autosignatura.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2720,7 +2770,7 @@ msgstr ""
 "\n"
 "AV�S: la signatura no es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2728,7 +2778,7 @@ msgstr ""
 "\n"
 "AV�S: la signatura no es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2736,7 +2786,7 @@ msgstr ""
 "\n"
 "La signatura es marcar� com a inexportable.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2744,7 +2794,7 @@ msgstr ""
 "\n"
 "La signatura es marcar� com a irrevocable.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2752,7 +2802,7 @@ msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2760,7 +2810,7 @@ msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2768,34 +2818,34 @@ msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el proc�s de signatura: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no est� protegida.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau prim�ria no estan disponibles.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "La clau est� protegida.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2803,7 +2853,7 @@ msgstr ""
 "Introdu�u la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2812,139 +2862,139 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Esteu segur de voler fer a��? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "s'est� posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "ix del men�"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "desa"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "ajuda"
 
 # �pantalla� o �ajuda�?  ivb
 # �ajuda�, evidentment. jm
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "llista"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcci�. jm
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "clau"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "tria la clau secund�ria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "comprova"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "llista les signatures"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "signa la clau"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "signa la clau irrevocablement"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "signa la clau localment i irrevocablement"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
@@ -2952,368 +3002,366 @@ msgstr "addphoto"
 # Si et refereixes a Photo vs. photo, ho deixe en min�scules, que en tot
 # el men� est� tot en min�scules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en catal�. Potser li ho dir� a Werner. jm.
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "esborra un ID d'usuari"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "afegeix una clau secund�ria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "esborra una clau secund�ria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocaci�"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "esborra signatures"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "canvia la data de caducitat"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primari"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "canvia entre el llistat de claus secretes i p�bliques"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "llista les prefer�ncies (expert)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "llista les prefer�ncies (detallat)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "prefer�ncies actualitzades"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "canvia la confian�a"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoca una clau secund�ria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "desactiva una clau"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "mostra el photo ID"
 
 # Dest�s? ivb
 # Desat�s, s�. jm
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "no es pot fet aix� en mode desat�s\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "La clau est� revocada."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no est� permesa mentre s'est� en mode %s.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Voleu actualitzar les prefer�ncies per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Realment voleu actualitzar les prefer�ncies? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Funcionalitats: "
 
 # Potser %s haja d'anar darrere de �clau�.  ivb
 # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sensible)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subclau ha estat revocada: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- s'ha trobat una revocaci� falsa\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
 
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "revkey"
+msgstr "[revocada]"
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "expire"
+msgstr "[caducada]"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3321,8 +3369,14 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no �s necess�riament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3331,137 +3385,136 @@ msgstr ""
 "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. S�... (s/N/x) jm
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2255
-#, fuzzy
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "Voleu esborrar aquesta signatura desconeguda? (y/N/q)"
+msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # FIXME: use ngettext. jm
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # FIXME: use ngettext. jm
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"AV�S: Aquesta �s una clau d'estil PGP 2.x. Afegir un revocador dessignat "
-"pot\n"
+"AV�S: Aquesta �s una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "No podeu afegir un revocador dessignat a una clau d'estil PGP 2.x.\n"
+msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n"
+msgstr ""
+"no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "no podeu designar una clau com el seu propi revocador\n"
+msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "no podeu designar una clau com el seu propi revocador\n"
+msgstr ""
+"AV�S: no es pot desfer la nominaci� d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "no podeu designar una clau com el seu propi revocador\n"
+msgstr ""
+"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau prim�ria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari �%s�\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3470,7 +3523,7 @@ msgstr ""
 "�\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3479,59 +3532,59 @@ msgstr ""
 "�\n"
 "signat localment amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocaci� per a aquesta signatura? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signat per %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signat per %08lX el %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari �%s� ja est� revocat\n"
@@ -3540,12 +3593,12 @@ msgstr "l'ID d'usuari �%s� ja est� revocat\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AV�S: una signatura d'ID d'usuari est� datada %d segons en el futur\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3575,34 +3628,34 @@ msgstr "Notaci� de signatura: "
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Anell"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau prim�ria:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau prim�ria:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Empremta digital ="
 
@@ -3713,81 +3766,88 @@ msgid "can't handle these multiple signatures\n"
 msgstr "no es poden tractar aquestes signatures m�ltiples\n"
 
 # �%.*s� no ser� una data?  Caldr� �el� al davant.  ivb
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "No hi ha ajuda disponible"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
-msgstr "Aquesta signatura va caducar el %s.\n"
+msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "Aquesta signatura va caducar el %s.\n"
+msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s signatura de: �%s�\n"
+msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "primari"
+msgstr "binari"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "mode text"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "la versi� �s desconeguda"
+msgstr "desconeguda"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "no �s una signatura separada\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AV�S: s'han detectat m�ltiples signatures. Nom�s es comprovar� la primera.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura aut�noma de classe 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel inv�lid en proc_tree()\n"
 
@@ -3831,12 +3891,17 @@ msgstr "AV�S: %s �s una opci� desaconsellada.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu �%s%s� en el seu lloc\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "aquest missatge pot no ser usable per %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau p�blica %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
@@ -4051,8 +4116,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "l'enviament a �%s� ha fallat: status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "aquest servidor de clau no �s completament compatible amb HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4153,33 +4218,41 @@ msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr ""
 "clau %08lX: no hi ha una subclau per al paquet de la subclau de revocaci�\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "clau %08lX: no hi ha una subclau per a l'enlla� de la clau\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n"
+msgstr ""
+"no es poden ficar dades de notaci� dins de signatures v3 (estil PGP 2.x)\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n"
+msgstr ""
+"no es poden ficar dades de notaci� dins de signatures de clau v3 (estil PGP "
+"2.x)\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AV�S: no s'ha pogut %%-expandir la notaci� (massa gran). S'utilitza no "
 "expandida.\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "no es pot designar a una clau d'estil PGP 2.x com a revocador\n"
+msgstr ""
+"no es pot ficar una URL de pol�tica dins de signatures v3 (estil PGP 2.x)\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
+"no es pot ficar una URL de pol�tica dins de signatures de clau v3 (estil PGP "
+"2.x)\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4187,22 +4260,22 @@ msgstr ""
 "AV�S: no s'ha pogut %%-expandir l'url de pol�tica (massa gran). S'utilitza "
 "no expandida.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s signatura de: �%s�\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AV�S: �%s� �s un fitxer buit\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
@@ -4219,11 +4292,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del destinatari\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
@@ -4435,36 +4508,34 @@ msgstr ""
 "no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
 "\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pr�xima comprovaci� de la base de dades de confian�a ser� el %s\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "si us plau, feu un --check-trustdb\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "s'est� comprovant la base de dades de confian�a\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "no s'ha trobat la clau p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr ""
-"no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n"
+msgstr "no s'han trobat claus amb confian�a absoluta\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4473,7 +4544,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5107,9 +5178,8 @@ msgid "Is this photo correct (y/N/q)? "
 msgstr "�s aquesta foto correcta (s/N/x)? "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "no s'ha pogut fixar l'exec-path a %s\n"
+msgstr "no s'ha pogut mostrar el photo ID!\n"
 
 # Execuci� de programes remots, o execuci� remota de programes? jm
 #: g10/exec.c:48
@@ -5264,34 +5334,34 @@ msgstr ""
 "d'impressi� de la vostra m�quina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la ra� de la revocaci�:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ac�)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introdu�u una descripci� opcional; finalitzeu amb una l�nia en blanc:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Ra� de la revocaci�: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripci�)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "�s a�� correcte? "
 
@@ -5336,6 +5406,9 @@ msgstr "error en trobar el registre de confian�a: %s\n"
 msgid "read error: %s\n"
 msgstr "error de lectura: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "aquest servidor de clau no �s completament compatible amb HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr ""
 #~ "L'�s d'aquest algoritme est� desaconsellat - el voleu crear igualment? "
@@ -5487,9 +5560,6 @@ msgstr "error de lectura: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "error al llegir clau prim�ria per al LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: ha fallat search_record: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "clau %08lX: la consulta del registre ha fallat\n"
 
@@ -5502,9 +5572,6 @@ msgstr "error de lectura: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "clau %08lX: les claus p�blica i secreta no coincideixen\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "no s'ha pogut enumerar les claus secretes: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "clau %08lX.%lu: Enlla� de subclau correcta\n"
 
diff --git a/po/cs.po b/po/cs.po
index e721c40d4..8c954bd40 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-24 17:50+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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "ukon�it"
 
@@ -271,62 +271,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -356,6 +356,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "hashovac� algoritmus `%s' je v tomto release read-only\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -365,7 +370,7 @@ msgstr ""
 "Pros�m �ekejte, je nutn� z�skat dostatek entropie. Aby jste se nenudili,\n"
 "m��ete na po��ta�i d�lat n�co jin�ho, zv���te tak kvalitu entropie.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -373,169 +378,169 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[soubor]|�ifrovat soubor"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "pouze ulo�en�"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[soubor]|de�ifrovat soubor"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "zkontrolovat podpisy kl���"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "podepsat kl�� bez mo�nosti revokace podpisu"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "podepsat kl�� lok�ln� a bez mo�nosti\n"
 " revokace podpisu"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "vypsat pouze po�ad� paket�"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr ""
 "exportovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr ""
 "importovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "neinteraktivn� aktualizace datab�ze d�v�ry"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "opravit naru�enou datab�zi d�v�ry"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Dek�dovat ASCII soubor nebo std. vstup"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Zak�dovat soubor nebo std. vstup do ASCII"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]|vypi� hash"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,213 +550,213 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|JM�NO|pou��t JM�NO jako implicitn�ho adres�ta"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr ""
 "pou��t implicitn� kl�� jako implicitn�ho\n"
 " adres�ta"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 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:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��vat termin�l"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "vynutit podpisy verze 3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "nevynucovat podpisy verze 3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "vynutit podpisy verze 4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "nevynucovat podpisy verze 4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "pro �ifrov�n� v�dy pou��t MDC"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "pro �ifrov�n� nikdy nepou��t MDC"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "pou�ijte gpg-agenta"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy se na nic neptat"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "automaticky odpov�d�t ANO na v�t�inu ot�zek"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "automaticky odpov�d�t NE na v�t�inu ot�zek"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 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:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "p�idat tento soubor tajn�ch kl��� do seznamu"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "uka� ve kter�m souboru kl��� je vypsan� kl��"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|JM�NO|pou�ij JM�NO jako implicitn� tajn� kl��"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 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:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|JM�NO|nastav znakovou sadu termin�lu na JM�NO"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "��st nastaven� ze souboru"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[SOUBOR]|zapi� informaci o stavu do SOUBORu"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KL��|�pln� d�v��ovat tomuto kl��i"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|SOUBOR|nahr�t roz�i�uj�c� modul SOUBOR"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emulovat m�d popsan� v RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|pou��t m�d hesla N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|pou��t hashovac� algoritmus ALG pro hesla"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|pou��t �ifrovac� algoritmus ALG pro hesla"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou��t �ifrovac� algoritmus ALG"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou��t hashovac� algoritmus ALG"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou��t kompresn� algoritmus N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "zahodit identifik�tor kl��e z �ifrovan�ch\n"
 " paket�"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Zobrazit fotografick� ID"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazovat fotografick� ID"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavit p��kazov� ��dek k prohl��en�\n"
 " fotografick�ho ID"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -759,7 +764,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -777,17 +782,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -797,7 +802,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -805,321 +810,355 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = podpis nalezen v definici skupiny \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, 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:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 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:1921
+#: g10/g10.c:1896
 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:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro kompresi\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nelze otev��t %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 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:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1127,19 +1166,19 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
@@ -1280,7 +1319,7 @@ msgstr ""
 "K nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                alias \""
 
@@ -1338,7 +1377,7 @@ msgstr " s = p�esko�it tento kl��\n"
 msgid " q = quit\n"
 msgstr " u = ukon�it\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
@@ -1594,7 +1633,7 @@ msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
@@ -1612,7 +1651,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "P�esto vytvo�it? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -1822,29 +1861,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1852,16 +1891,16 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1873,7 +1912,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1886,53 +1925,53 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, 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:2265
+#: g10/keygen.c:2267
 #, 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:2285
+#: g10/keygen.c:2287
 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:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "kl�� ozna�en jako absolutn� d�v�ryhodn�.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1940,12 +1979,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1953,7 +1992,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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1961,15 +2000,15 @@ 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:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Opravdu vytvo�it? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
@@ -1988,17 +2027,17 @@ msgstr "chyba p�i vytv��en� hesla: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�du S2K nelze pou��t symetrick� ESK paket\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VAROV�N�: soubor je pr�zdn�\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete �ifrovat pouze RSA kl��em o d�lce 2048 bit� a m�n�\n"
@@ -2013,12 +2052,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� kompresn� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
@@ -2028,340 +2067,340 @@ msgstr "vy��dan� kompresn� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kl�� `%s' nenalezen: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kl�� %08lX: nen� ve form�tu RFC 2440 - p�esko�eno\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kl�� %08lX: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kl�� %08lX: PGP 2.x kl�� - p�esko�eno\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User ID not found]"
 
 # c-format
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� kl�� %08lX zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "existuje tajn� kl�� pro tento ve�ejn� kl�� \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, 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"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportov�no: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "POZN�MKA: detekov�n prim�rn� kl�� Elgamal - import m��e chvilku trvat\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "kl�� %08lX: HKP po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "kl�� %08lX: p�ijat id u�ivatele '%s',kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kl�� %08lX: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kl�� %08lX: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kl�� %08lX: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "kl�� %08lX: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kl�� %08lX: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kl�� %08lX: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kl�� %08lX: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "kl�� %08lX: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "kl�� %08lX: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "kl�� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "kl�� %08lX: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "kl�� %08lX: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "kl�� %08lX: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "kl�� %08lX: \"%s\" beze zm�n\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %08lX: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kl�� %08lX: tajn� kl�� importov�n\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kl�� %08lX: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kl�� %08lX: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kl�� %08lX: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %08lX: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kl�� %08lX: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "kl�� %08lX: neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
@@ -2369,17 +2408,17 @@ msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "kl�� %08lX: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "kl�� %08lX: neplatn� revoka�n� podkl��\n"
@@ -2387,17 +2426,17 @@ msgstr "kl�� %08lX: neplatn� revoka�n� podkl��\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "kl�� %08lX: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kl�� %08lX: identifik�tor u�ivatele p�esko�en '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kl�� %08lX: podkl�� p�esko�en\n"
@@ -2406,54 +2445,54 @@ msgstr "kl�� %08lX: podkl�� p�esko�en\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kl�� %08lX: podpis nen� exportovateln� (t��da %02x) - p�esko�eno\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %08lX: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %08lX: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %08lX: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kl�� %08lX: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "VAROV�N�: kl�� %08lX m��e b�t revokov�n: zkou��m z�skat revoka�n�kl�� %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "VAROV�N�: kl�� %08lX m��e b�t revokov�n: revoka�n� kl�� %08lX nenalezen.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "kl�� %08lX: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "kl�� %08lX: podpis kl��e j�m sam�m (direct key signature)\n"
@@ -2507,20 +2546,27 @@ msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "VAROV�N�: ID u�ivatele \"%s\" nen� podeps�no j�m sam�m\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2529,11 +2575,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2543,14 +2589,14 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nradit j�m ten, jeho� platnost vypr�ela? (a/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2560,54 +2606,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nic k podeps�n� kl��em %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2617,31 +2663,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (implicitn�)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2649,7 +2695,7 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2657,7 +2703,7 @@ msgstr ""
 "\n"
 "Jedn� se o podpis kl��e j�m sam�m\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2665,7 +2711,7 @@ msgstr ""
 "\n"
 "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2673,7 +2719,7 @@ msgstr ""
 "\n"
 "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2681,7 +2727,7 @@ msgstr ""
 "\n"
 "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2689,7 +2735,7 @@ msgstr ""
 "\n"
 "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2697,7 +2743,7 @@ msgstr ""
 "\n"
 "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2705,7 +2751,7 @@ msgstr ""
 "\n"
 "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2713,34 +2759,34 @@ msgstr ""
 "\n"
 "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Skute�n� podepsat? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2748,7 +2794,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2756,493 +2802,493 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Opravdu to chcete ud�lat? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 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:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "ulo�it"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "vyberte sekund�rn� kl�� N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "vypsat seznam podpis�"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "podepsat kl��"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "podepsat kl�� bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "podepsat kl�� lok�ln� a  bez mo�nosti odvolat podpis (non-revocably)"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "smazat identifik�tor u�ivatele"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "p�idat sekund�rn� kl��"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "smazat podpisy"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "zm�nit dobu platnosti"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 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:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "nastavit seznam p�edvoleb"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "aktualizovat p�edvolby"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "odvolat platnost id u�ivatele"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, 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:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Opravdu podepsat v�echny id u�ivatele? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Opravdu chcete smazat vybran� kl��e? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Opravdu chcete smazat tento kl��? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Opravdu chcete revokovat vybran� kl��e? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Opravdu chcete revokovat tento kl��? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Opravdu aktualizovat p�edvolby? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Ulo�it zm�ny? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Ukon�it bez ulo�en�? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr "(citliv� informace)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr "d�v�ra: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podkl�� byl revokov�n: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- nalezena pad�lan� revokace\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�m ov��en� revokace: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3250,7 +3296,13 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3259,45 +3311,45 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3306,84 +3358,84 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 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:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "id u�ivatele: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3392,7 +3444,7 @@ msgstr ""
 "\"\n"
 "podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3401,56 +3453,56 @@ msgstr ""
 "\"\n"
 "lok�ln� podeps�no Va��m kl��em %08lX v %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   podeps�no %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokov�no %08lX v %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   podeps�no %08lX v %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
@@ -3459,12 +3511,12 @@ msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3494,34 +3546,34 @@ msgstr "Podepisovac� notace: "
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnost skon��: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint kl��e ="
 
@@ -3633,81 +3685,90 @@ 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:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Pomoc nen� k dispozici"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "�PATN� podpis od \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Podpis s vypr�enou platnost� od \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[nejist�]  "
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "nezn�m� verze"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -3751,12 +3812,17 @@ msgstr "VAROV�N�: pou��v�n� parametru \"%s\" se nedoporu�uje\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "tato zpr�va nemus� b�t s %s pou�iteln�\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 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:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -3957,8 +4023,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "chyba odesl�n� na `%s': (status=%u)\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "tento keyserver nen� pln� kompatibiln� s HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4056,33 +4122,38 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci podkl��e\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROV�N�: nelze %%-expandovat notaci (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4090,22 +4161,22 @@ msgstr ""
 "VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
 "neexpandovan�.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
@@ -4121,11 +4192,11 @@ msgstr "%s: nemohu vytvo�it: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
@@ -4328,7 +4399,7 @@ msgstr "datab�ze d�v�ry: synchronizace selhala %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
@@ -4341,22 +4412,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "ve�ejn� kl�� %08lX nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, 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"
@@ -4364,7 +4435,7 @@ msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, 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"
@@ -5127,33 +5198,33 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Je d�vod revokace vybr�n spr�vn�? "
 
@@ -5197,3 +5268,6 @@ msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "chyba p�i �ten�: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "tento keyserver nen� pln� kompatibiln� s HKP\n"
diff --git a/po/da.po b/po/da.po
index c7d0c8bd2..a3aeea9dc 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: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+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"
@@ -48,7 +48,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "afslut"
 
@@ -278,62 +278,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -363,6 +363,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -370,7 +375,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -378,170 +383,170 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -551,207 +556,207 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 #, 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -771,16 +776,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 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:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -790,7 +795,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -798,348 +803,382 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 #, 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:1940
+#: g10/g10.c:1915
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
+#: g10/g10.c:1974
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1979
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1984
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:2042
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "signering fejlede: %s\n"
+
+#: g10/g10.c:2361
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr ""
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1282,7 +1321,7 @@ msgstr ""
 "Ingen tillidsv�rdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "              alias \""
 
@@ -1336,7 +1375,7 @@ msgstr ""
 msgid " q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Dit valg? "
 
@@ -1589,7 +1628,7 @@ msgstr "   (%d) ElGamal (krypt�r kun)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -1605,7 +1644,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Brug denne n�gle alligevel? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -1786,28 +1825,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 #, 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1815,17 +1854,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1833,7 +1872,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1841,84 +1880,84 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, 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:2244
+#: g10/keygen.c:2246
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr ""
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
@@ -1937,17 +1976,17 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
@@ -1961,12 +2000,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -1976,333 +2015,333 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
 #. 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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, fuzzy, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, fuzzy, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
@@ -2310,17 +2349,17 @@ msgstr ""
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
@@ -2328,17 +2367,17 @@ msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -2347,52 +2386,52 @@ msgstr ""
 #. * 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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
@@ -2446,935 +2485,948 @@ msgstr ""
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr ""
 
 #: g10/keyedit.c:382
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 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:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 #, fuzzy
 msgid " (default)"
 msgstr "(standard er 1)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "nrsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "slet bruger id"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "addrevoker"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "showpref"
 msgstr "vispr�f"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "setpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "set preference list"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr ""
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undern�gle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "udl�b"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 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:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 #, 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:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
 "locally signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 #, 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:3052
+#: g10/keyedit.c:3126
 #, 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
@@ -3383,12 +3435,12 @@ msgstr "N�glen er beskyttet.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3419,38 +3471,38 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "             Fingeraftryk:"
@@ -3558,81 +3610,90 @@ msgstr ""
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Ingen hj�lp tilg�ngelig"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -3673,12 +3734,17 @@ msgstr "ADVARSEL: '%s' er en tom fil\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -3874,7 +3940,7 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
+msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
 #: g10/hkp.c:519
@@ -3965,49 +4031,54 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, fuzzy, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4021,11 +4092,11 @@ msgstr "kan ikke oprette %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4226,7 +4297,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -4240,21 +4311,21 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4262,7 +4333,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -4898,34 +4969,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "Brug denne n�gle alligevel? "
diff --git a/po/de.po b/po/de.po
index 28b35929c..7bcc790e1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-05-01 11:58+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-18 11:58+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "quit"
 
@@ -274,63 +274,63 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -361,6 +361,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "Hashmethode `%s' ist in diesem Release read-only\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 # translated by wk
 #: cipher/rndegd.c:204
 msgid ""
@@ -371,7 +376,7 @@ msgstr ""
 "Zufalls wird gesammelt.  Bitte arebiten Sie an etwas anderem, da\n"
 "so die Qualit�t der Zufallszahlen erh�ht werden kann.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -379,163 +384,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[Dateien]|Dateien verschl�sseln"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[Dateien]|Dateien entschl�sseln"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "Schl�ssel nicht widerrufbar signieren"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "Schl�ssel nur f�r diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "unbeaufsichtigtes �ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,201 +550,201 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "Beim Verschl�sseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Passphrasen-Modus N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Passphrasen benutzen"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl.verfahren NAME f�r Passphrasen benutzen"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "Empf�nger-ID verschl�sselter Pakete entfernen"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -748,7 +753,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -768,17 +773,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -788,7 +793,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -796,326 +801,360 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses (%s) \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung \"%s\" wurde wegen falscher Rechte nicht "
 "geladen\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, 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:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, 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:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "enum_secret_keys fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "enum_secret_keys fehlgeschlagen: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1123,19 +1162,19 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
@@ -1274,7 +1313,7 @@ msgstr ""
 "Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                    alias \""
 
@@ -1333,7 +1372,7 @@ msgstr " s = diesen Schl�ssel �berSpringen\n"
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
@@ -1597,7 +1636,7 @@ msgstr "   (%d) RSA (nur verschl�sseln)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -1616,7 +1655,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Trotzdem erstellen? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
@@ -1823,27 +1862,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1851,16 +1890,16 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1873,7 +1912,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1884,53 +1923,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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1939,12 +1978,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1952,7 +1991,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1960,15 +1999,15 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
@@ -1989,17 +2028,17 @@ msgstr ""
 "Aufgrund des S2K-Modus kann ein symmetrisches ESK Packet nicht benutzt "
 "werden\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur f�r RSA-Schl�ssel mit maximal 2048 Bit "
@@ -2017,14 +2056,14 @@ msgstr ""
 "Die IDEA-Verschl�sselung kann nicht mit allen Zielschl�sseln verwendet "
 "werden.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2036,351 +2075,351 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schl�ssel %08lX hat keine einfache SK Pr�fsumme\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, 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:2009
+#: g10/getkey.c:2074
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "Kein privater Schl�ssel zum �ffentlichen Schl�ssel %08lX - �bergangen\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "HINWEIS: Elgamal-Hauptschl�ssel gefunden - der Import k�nnte einige Zeit "
 "dauern\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
 "�bersprungen\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
@@ -2388,19 +2427,19 @@ msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
@@ -2408,18 +2447,18 @@ msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -2428,57 +2467,57 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
@@ -2532,20 +2571,27 @@ msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User-ID \"%s\" ist widerrufen."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "WARNUNG: User-ID \"%s\" ist nicht eigenbeglaubigt.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2554,11 +2600,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2567,7 +2613,7 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
@@ -2575,7 +2621,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2584,44 +2630,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 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:474
+#: g10/keyedit.c:510
 #, 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:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immmer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2629,11 +2675,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 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:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2643,31 +2689,31 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, 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:608
+#: g10/keyedit.c:644
 #, 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:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2675,7 +2721,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2683,7 +2729,7 @@ msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2692,7 +2738,7 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2700,7 +2746,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2708,7 +2754,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2716,7 +2762,7 @@ msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2724,7 +2770,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2732,7 +2778,7 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2740,34 +2786,34 @@ msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2775,7 +2821,7 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2783,492 +2829,492 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 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:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 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:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 msgid "[revoked] "
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 msgid "[expired] "
 msgstr "[verfallen]"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3276,7 +3322,13 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3286,45 +3338,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 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:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3334,17 +3386,17 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl��sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
@@ -3353,71 +3405,71 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3426,7 +3478,7 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3435,56 +3487,56 @@ msgstr ""
 "\"\n"
 "lokal unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
@@ -3493,13 +3545,13 @@ msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3529,34 +3581,34 @@ msgstr "Beglaubigungs-\"Notation\": "
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
@@ -3667,79 +3719,88 @@ 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:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Keine Hilfe vorhanden."
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 msgid "binary"
 msgstr "Bin�re"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste gepr�ft.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -3780,12 +3841,17 @@ msgstr "WARNUNG: \"%s\" ist eine mi�billigte Option.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "Diese Botschaft k�nnte f�r %s unbrauchbar sein\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -3986,8 +4052,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "Dieser Schl�sselserver ist nicht vollst�ndig HKP kompatibel\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4092,39 +4158,46 @@ msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr ""
+"Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
+"Beglaubigung\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Notationen k�nnen in einen v3 (PGP 2.x-artigen) Schl�ssel nicht eingetragen "
 "werden\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "Notationen k�nnen in eine v3 (PGP 2.x-artige) Schl�sselunterschrift nicht "
 "eingetragen werden\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "WARNUNG: \"Notation\" kann nicht %%-erweitert werden (zu gro�). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einen v3 (PGP 2.x-artigen) Schl�ssel nicht "
 "eingetragen werden\n"
 
 # translated by wk
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 "Eine Policy URL kann in einem v3 Schl�ssel(PGP 2.x artig) nicht gespeichert "
 "werden\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4132,22 +4205,22 @@ msgstr ""
 "WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
 "\"unerweiterte\".\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
@@ -4164,11 +4237,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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 "
@@ -4376,7 +4449,7 @@ msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
@@ -4389,22 +4462,22 @@ msgstr "Bitte ein --check-trustdb durchf�hren\n"
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
 # translated by wk
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schl�ssel verarbeitet (%d Validity Z�hler gel�scht)\n"
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
 msgstr "kein uneingeschr�nkt vertrauensw�rdiger Schl�ssel %08lX gefunden\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4413,7 +4486,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "�berpr�fen, Tiefe %d, g�ltig=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -5212,34 +5285,34 @@ msgstr ""
 "Drucksystem kann unter Umst�nden eine Kopie anderen Nutzern zug�nglich\n"
 "machen.\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich m�chten Sie hier %d ausw�hlen)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund f�r Widerruf: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Ist das richtig? "
 
@@ -5284,6 +5357,9 @@ msgstr "Fehler beim Suchen des \"Trust records\": %s\n"
 msgid "read error: %s\n"
 msgstr "Lesefehler: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "Dieser Schl�sselserver ist nicht vollst�ndig HKP kompatibel\n"
+
 #~ msgid "ERROR: "
 #~ msgstr "FEHLER: "
 
@@ -5604,9 +5680,6 @@ msgstr "Lesefehler: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "Fehler beim Lesen den Hauptschl�ssels der LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "Schl�ssel %08lX: Satzabfrage fehlgeschlagen\n"
 
@@ -5621,9 +5694,6 @@ msgstr "Lesefehler: %s\n"
 #~ "Schl�ssel %08lX: geheimer und �ffentlicher Schl�ssel passen nicht "
 #~ "zusammen.\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enum_secret_keys fehlgeschlagen: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "Schl�ssel %08lX.%lu: Korrekte Unterschl�ssel-Anbindung\n"
 
diff --git a/po/el.po b/po/el.po
index a7be91c0d..9a05bbf62 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-25 18:03+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "���"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "�����������"
 
@@ -272,64 +272,64 @@ msgstr "... ���� ����� bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "������� ��� bug ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -360,6 +360,11 @@ msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 "� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -369,7 +374,7 @@ msgstr ""
 "������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
 "��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -377,163 +382,163 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[������]|������������� �������"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "���������� ����"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[������]|���������������� �������"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "�������� ���� �������� ��-�����������"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "�������� ���� �������� ������ ��� ��-�����������"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "���������� ���� ��� ���������� �������"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "������� ��� ����� ������������"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "�������� ��� ����� ������������"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "�������� ��� �������������� ����� ��������� ������������"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "�������� ���� ��������� ����� ��������� ������������"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "��������-��������� ���� ������� � stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "��������-��������� ���� ������� � stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -543,198 +548,198 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "����� ��� ��������������� �������� �� ��������������� ���������"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "���������"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "������������ ������ v3 ���������"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "��� ������������ ������ v3 ���������"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "������������ ������ v4 ���������"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "��� ������������ ������ v4 ���������"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "����� ������� MDC ��� �������������"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "���� ����� MDC ��� �������������"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "����� ��� gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "�������� ����� ��� �������� ����������� ��� �����"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�����|���������� ��� ��� ���������� ���������� �� �����"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "�������� �������� ��� ������"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[������]|������� ��� ����������� ���������� ��� ������"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|������� ����������� �� ���� �� ������"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "��������� ��� ���������� ��� ������������ ��� RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "����������� ���� ��� �������� ������,���������� ��� �������� �� OPENPGP"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "������� ���� ��� �������� ������,����������,�������� �� PGP 2.x �����������"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|����� ��� ���������� ������ ������ N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|ONOMA|����� ��� ���������� ��������� ��������� ����� ��� ������� �������"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|�����|����� ���������� �������������� ����� ��� ������� �������"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|����� ���������� ��������� N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "�������� ��� ������ keyid ��� ���������������� �������"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "���������� ��� Photo ID"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "�� ���������� ��� Photo ID"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "������� ��� ������� ������� ��� ���������� ��� Photo ID"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +747,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -762,15 +767,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -780,7 +785,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -788,326 +793,360 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "� ���������� ��������� ������ �� ����� ������ %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-check-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "�������� ��������� ��� %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "� ��������� �������� �������: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1115,19 +1154,19 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
@@ -1268,7 +1307,7 @@ msgstr ""
 "��� ������ ���� ������������ ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                ������ ��� \""
 
@@ -1326,7 +1365,7 @@ msgstr " s = ��������� ����� ��� ��������\n"
 msgid " q = quit\n"
 msgstr " q = �����������\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
@@ -1586,7 +1625,7 @@ msgstr "   (%d) RSA (��� ������������� ����)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (�������� ��� �������������)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -1605,7 +1644,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "����������; "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -1817,27 +1856,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1845,16 +1884,16 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1866,7 +1905,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1878,53 +1917,53 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "�������� �������� ��� �������� ������������.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1934,12 +1973,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1947,7 +1986,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1955,17 +1994,17 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "������� �� ������������; "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
@@ -1984,17 +2023,17 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�������� ������ ���� ����������� ������� ESK ���� ��� ���������� S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �������������: ����� ������\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "������������� �� ������� RSA ��� 2048 bit � ��� ���� ���� �� ��������� --"
@@ -2012,14 +2051,14 @@ msgstr ""
 "�������� ������ ��� ��������������� IDEA ��� ��� �� ������� �� �� "
 "�������������������.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2031,339 +2070,339 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "������ %08lX: ��� ����� ��� rfc2440 ������ - ������������\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "������� ��� ������� ������ ��� �� ������� ������ \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "��������: ���������� ����������� �������� Elgamal - ���� ����� ���� �����\n"
 "          ��� ��� �������� ���\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
@@ -2371,17 +2410,17 @@ msgstr "������ %08lX: �� ������ �������� �����������\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
@@ -2389,17 +2428,17 @@ msgstr "������ %08lX: �� ������ �������� �����������\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
@@ -2408,58 +2447,58 @@ msgstr "������ %08lX: ������������ ���������\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
@@ -2513,20 +2552,27 @@ msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�� user ID \"%s\" ����������."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2535,11 +2581,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2548,14 +2594,14 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2564,43 +2610,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2608,11 +2654,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2622,31 +2668,31 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (��������������)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2654,7 +2700,7 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2662,7 +2708,7 @@ msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2670,7 +2716,7 @@ msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2679,7 +2725,7 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2687,7 +2733,7 @@ msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2696,7 +2742,7 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2704,7 +2750,7 @@ msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2712,7 +2758,7 @@ msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2720,34 +2766,34 @@ msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2755,500 +2801,500 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "������� ������������� �������� N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "���������� ���������"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "�������� ��� ��������"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "�������� ��� �������� ��-�����������"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "�������� ��� �������� ������ ��� ��-�����������"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "�������� ���� user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "������ ��� ����������� �����"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "��������"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "����������� ��������"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "������> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (���������)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����������: %s ����: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �� ������ ����������: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- ������� ������������ ��������\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �������� ���� ������ ���������: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3256,7 +3302,13 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3265,45 +3317,45 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3313,16 +3365,16 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
@@ -3330,72 +3382,72 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ������� ���������� ������ �� ������ %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3404,7 +3456,7 @@ msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3413,56 +3465,56 @@ msgstr ""
 "\"\n"
 "����������� ������ �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
@@ -3471,13 +3523,13 @@ msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@ -3506,34 +3558,34 @@ msgstr "�������� ���������: "
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "����������"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     ��������� �������� ="
 
@@ -3640,81 +3692,90 @@ msgstr "��������� ��������� ���������\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�������� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "��� ������� ��������� �������"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "��������"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "������� ������"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -3759,12 +3820,17 @@ msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -3964,8 +4030,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "�������� ���� �������� ���� �� `%s': ���������=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "����� � ����������� �������� ��� ����� ������ HKP ��������\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4063,36 +4129,41 @@ msgstr "������� ����� ��������� ��� ������ %08lX ���� �������� �������� bit\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "������ %08lX: ������ ��������� ��� �� ������ ��������� �����������\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "�������������: �������� ���� %%-�������� ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4100,22 +4171,22 @@ msgstr ""
 "�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
 "               ����� �� ������������.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
@@ -4133,11 +4204,11 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
@@ -4341,7 +4412,7 @@ msgstr "trustdb: sync �������: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@ -4354,23 +4425,23 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4379,7 +4450,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "������� �� ����� %d �����������=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -5152,33 +5223,33 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "����� ���� �������; "
 
@@ -5222,3 +5293,6 @@ msgstr "������ ���� ������ ��� �������� ������������: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "������ ���������: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "����� � ����������� �������� ��� ����� ������ HKP ��������\n"
diff --git a/po/eo.po b/po/eo.po
index 74b617e90..5a838f16a 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: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+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"
@@ -46,7 +46,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "fini"
 
@@ -273,63 +273,63 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,6 +359,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -366,7 +371,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -374,163 +379,163 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[dosieroj]|�ifri dosierojn"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[dosieroj]|mal�ifri dosierojn"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "subskribi �losilon loke kaj nerevokeble"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "senintervena aktualigo de fido-datenaro"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -540,195 +545,195 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "ne devigi v3-subskribojn"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "devigi v4-subskribojn"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "ne devigi v4-�losilsubskribojn"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "neniam uzi MDC por �ifrado"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "uzi gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[dosiero]|skribi statusinformojn al dosiero"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi �i tiun �losilon absolute"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Montri Foto-Identigilojn"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Ne montri Foto-Identigilojn"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Agordi komandlinion por montri Foto-Identigilojn"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +741,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,15 +761,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +779,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,323 +787,357 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Tiu komando ne eblas en la re�imo %s.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record malsukcesis: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1107,20 +1146,20 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
@@ -1264,7 +1303,7 @@ msgstr ""
 "Nenia fidovaloro atribuita al:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "            alinome \""
 
@@ -1322,7 +1361,7 @@ msgstr " s = supersalti �i tiun �losilon\n"
 msgid " q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Via decido? "
 
@@ -1581,7 +1620,7 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -1597,7 +1636,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "�u tamen uzi �i tiun �losilon? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -1803,27 +1842,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1831,16 +1870,16 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1852,7 +1891,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1864,53 +1903,53 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "�losilo markita kiel absolute fidata.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1918,12 +1957,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1931,7 +1970,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1939,15 +1978,15 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "�u vere krei? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
@@ -1966,17 +2005,17 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "eblas �ifri nur per RSA-�losiloj de maksimume 2048 bitoj kun --pgp2\n"
 
@@ -1990,12 +2029,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "ne povas uzi la �ifron IDEA por �iuj �losiloj, al kiuj vi �ifras.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, fuzzy, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
@@ -2005,333 +2044,333 @@ msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, 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:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, fuzzy, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, 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:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 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:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, 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:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, 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:785
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, fuzzy, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, 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:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, 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:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, 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:1099
+#: g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
@@ -2339,17 +2378,17 @@ msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
@@ -2357,17 +2396,17 @@ msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -2376,52 +2415,52 @@ 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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, 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:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@ -2475,21 +2514,28 @@ msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 #, 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:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr ""
 
 #: g10/keyedit.c:382
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2500,7 +2546,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2509,7 +2555,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2520,14 +2566,14 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2538,7 +2584,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2547,53 +2593,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, 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:478
+#: g10/keyedit.c:514
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 #, 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:575
+#: g10/keyedit.c:611
 #, 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:577
+#: g10/keyedit.c:613
 #, 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:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2602,32 +2648,32 @@ 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:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 #, fuzzy
 msgid " (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2635,14 +2681,14 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 #, fuzzy
 msgid ""
 "\n"
@@ -2651,7 +2697,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 #, fuzzy
 msgid ""
 "\n"
@@ -2660,7 +2706,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2668,7 +2714,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2676,7 +2722,7 @@ msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2684,7 +2730,7 @@ msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2692,7 +2738,7 @@ msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2700,34 +2746,34 @@ msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2735,7 +2781,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2743,506 +2789,512 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsub"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "subskribi la �losilon nerevokeble"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsub"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la �losilon loke kaj nerevokeble"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "alfoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "forfoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "addrevoker"
 msgstr "revokita"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "�efa"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "monpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "agpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "aktpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "aktualigitaj preferoj"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "revsig"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "monfoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "Really revoke all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sentema)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "rev"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "eksval"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3251,46 +3303,46 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 #, 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:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3300,85 +3352,85 @@ 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:2379
+#: g10/keyedit.c:2449
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 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:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3387,7 +3439,7 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3396,59 +3448,59 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 #, 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:3052
+#: g10/keyedit.c:3126
 #, 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
@@ -3457,12 +3509,12 @@ msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3493,38 +3545,38 @@ msgstr "Subskribo-notacio: "
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "�losilaro"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
@@ -3630,80 +3682,89 @@ msgstr "kontrolo de subskribo estas mal�altita\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenia helpo disponata"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -3745,12 +3806,17 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, fuzzy, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -3950,7 +4016,7 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
+msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
 #: g10/hkp.c:519
@@ -4046,30 +4112,35 @@ msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, fuzzy, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4077,22 +4148,22 @@ msgstr ""
 "AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
 "kompletigo.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, fuzzy, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
@@ -4107,11 +4178,11 @@ msgstr "ne povas krei %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
@@ -4313,7 +4384,7 @@ msgstr "fido-datenaro: sync malsukcesis: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -4326,22 +4397,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
@@ -4349,7 +4420,7 @@ msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5096,37 +5167,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "�u tamen uzi �i tiun �losilon? "
@@ -5305,9 +5376,6 @@ msgstr "kiraso: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "eraro dum legado de �efa �losilo por LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record malsukcesis: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "�losilo %08lX: peto-registro malsukcesis\n"
 
@@ -5320,9 +5388,6 @@ msgstr "kiraso: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "�losilo %08lX: sekreta kaj publika �losiloj ne kongruas\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "�losilo %08lX.%lu: Bona sub�losila bindado\n"
 
diff --git a/po/es.po b/po/es.po
index 957d23cea..b9b2ec1d4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-04-26 21:00+0100\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-25 19:00+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "salir"
 
@@ -302,16 +302,16 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -321,49 +321,49 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - omitido\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -394,6 +394,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "el algoritmo de resumen `%s' es de s�lo lectura en esta versi�n\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -408,7 +413,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:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -416,163 +421,163 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheros]|cifra ficheros"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheros]|descifra ficheros"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "firma la clave no revocablemente"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "firma la clave localmente y no revocablemente"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o de la entrada est�ndar"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o a la entrada est�ndar"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -582,89 +587,89 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "no fuerza firmas v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "fuerza firmas v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "no fuerza firmas v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MDC para cifrar"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "nunca usa un MDC para cifrar"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
 # usa
 # Vale.
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "usa el agente gpg"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -674,108 +679,108 @@ 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:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[fichero]|escribe informaci�n de estado en el fichero"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "todas las opciones de paquete, cifrado y resumen tipo PGP 2.x"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 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:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las contrase�as"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Muestra IDs fotogr�ficos"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "No muestra IDs fotogr�ficos"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
 
@@ -783,7 +788,7 @@ msgstr "Ajusta linea de comandos para ver IDs fotogr�ficos"
 # 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:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -791,7 +796,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -811,15 +816,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -829,7 +834,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -837,301 +842,335 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, 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:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "este mensaje podr�a no ser utilizable por %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "no puede usar %s en modo %s\n"
+
+#: g10/g10.c:2077
 #, 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:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Creaci�n de la clave fallida: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "enumeraci�n de claves secretas fallida: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Creaci�n de la clave fallida: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record fallida: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "enumeraci�n de claves secretas fallida: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1139,17 +1178,17 @@ 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:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1157,19 +1196,19 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
@@ -1314,7 +1353,7 @@ msgstr ""
 "No hay confianza definida para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                alias \""
 
@@ -1372,7 +1411,7 @@ msgstr " s = saltar esta clave\n"
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Su decisi�n: "
 
@@ -1629,7 +1668,7 @@ msgstr "   (%d) RSA (s�lo cifrar)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (firmar y cifrar)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -1647,7 +1686,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "�Crear de todas formas?"
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -1854,29 +1893,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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 real o en el "
 "comentario\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1884,16 +1923,16 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1905,7 +1944,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1918,53 +1957,53 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "clave marcada como de confianza absoluta.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1972,12 +2011,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1985,7 +2024,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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1993,15 +2032,15 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
@@ -2020,17 +2059,17 @@ msgstr "error creando frase contrase�a: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "no puede usar un paquete sim�trico ESK debido al modo S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "solo puede cifrar a claves RSA de 2048 bits o menos en modo --pgp2\n"
 
@@ -2045,14 +2084,14 @@ msgid ""
 msgstr ""
 "no se puede usar el algoritmo IDEA para todas las claves a las que cifra.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2064,337 +2103,338 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - omitida\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: clave estilo PGP 2.x - omitida\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
+"AVISO: la clave secreta %08lX no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %08lX inv�lida hecha mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
+msgstr "no hay subclave secreta para la clave p�blica %08lX -ignorada\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTA: detectada clave primaria Elgamal - puede llevar algo de tiempo "
 "importarla\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "clave %08lX: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "clave %08lX: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "clave %08lX: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "clave %08lX: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "clave %08lX: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "clave %08lX: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "clave %08lX: \"%s\" sin cambios\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %08lX: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "clave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "clave %08lX: algoritmo de clave p�blica no disponible para el id \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "clave %08lX: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX: uni�n de subclave inv�lida\n"
@@ -2402,17 +2442,17 @@ msgstr "clave %08lX: uni�n de subclave inv�lida\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "clave %08lX: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "clave %08lX: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
@@ -2420,17 +2460,17 @@ msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "clave %08lX: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
@@ -2439,56 +2479,56 @@ msgstr "clave %08lX: subclave omitida\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "clave %08lX: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %08lX: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "AVISO: la clave %08lX puede estar revocada: recuperando clave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "AVISO: la clave %08lX puede estar revocada: falta clave de revocaci�n %"
 "08lX.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "clave %08lX: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "clave %08lX: firma directa de clave a�adida\n"
@@ -2542,20 +2582,27 @@ msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "ID de usuario \"%s\" revocado."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "ATENCI�N: el identificador de usuario \"%s\" no tiene autofirma.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2564,11 +2611,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2577,13 +2624,13 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2592,43 +2639,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" ya estaba firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2636,11 +2683,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2650,31 +2697,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr "(por defecto)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2682,7 +2729,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2690,7 +2737,7 @@ msgstr ""
 "\n"
 "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2698,7 +2745,7 @@ msgstr ""
 "\n"
 "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2706,7 +2753,7 @@ msgstr ""
 "\n"
 "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2714,7 +2761,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2722,7 +2769,7 @@ msgstr ""
 "\n"
 "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2730,7 +2777,7 @@ msgstr ""
 "\n"
 "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2738,7 +2785,7 @@ msgstr ""
 "\n"
 "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2746,34 +2793,34 @@ msgstr ""
 "\n"
 "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 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:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2781,7 +2828,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2789,494 +2836,492 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "graba"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "ayuda"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "hdac"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "idu"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "clave"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "comprueba"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "firma"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "firmal"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "firmanr"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "firma la clave irrevocablemente"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "firmanrl"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave local e irrevocablemente"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "a�aidu"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "a�ade un identificador de usuario"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "a�adirfoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "a�ade un ID fotogr�fico"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "borridu"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "borra un identificador de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "borfoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "a�acla"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "borrcla"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "a�arevoc"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "a�ade una clave de revocaci�n"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "borrfir"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primaria"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "marca ID de usuario como primario"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "cambia"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "muestra preferencias (experto)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "verpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias (prolijo)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "estpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "actpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "contr"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "conf"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revfir"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revidu"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revocar un identificador de usuario"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revcla"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "descla"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "habcla"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "verfoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "mostrar ID fotogr�fico"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "�Revocar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "�Revocar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "�Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta clave puede ser revocada por la clave %s"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (confidencial)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev-  se encontr� una revocaci�n falsificada\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "revcla"
+msgstr "[revocada]"
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "expira"
+msgstr "[caducada]"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3284,7 +3329,13 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3293,45 +3344,45 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3340,84 +3391,84 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "no puede elegir una clave como su propio revocador designado\n"
+msgstr ""
+"�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "no puede elegir una clave como su propio revocador designado\n"
+msgstr ""
+"�Est� seguro de querer elegir esta clave como revocador designado? (s/N): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, 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:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3426,7 +3477,7 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3435,56 +3486,56 @@ msgstr ""
 "\"\n"
 "firmada localmente con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmada por %08lX el %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
@@ -3493,12 +3544,12 @@ msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3528,34 +3579,34 @@ msgstr "Notaci�n de firma: "
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Anillo de claves"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "    Huella de clave ="
 
@@ -3661,80 +3712,87 @@ msgstr "suprimida la verificaci�n de la firma\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Ayuda no disponible"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Firma caducada de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
-msgstr "Esta firma caduc� el %s.\n"
+msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "Esta firma caduc� el %s.\n"
+msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "primaria"
+msgstr "binaria"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "modotexto"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "Versi�n desconocida"
+msgstr "desconocido"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -3778,12 +3836,17 @@ msgstr "ATENCI�N: \"%s\" es una opci�n desaconsejada.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "este mensaje podr�a no ser utilizable por %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 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:1069
+#: g10/parse-packet.c:1083
 #, 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"
@@ -3982,8 +4045,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "fall� el envio a `%s': status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "este servidor de claves no es totalmente compatible con HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4081,54 +4144,57 @@ msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr ""
 "clave %08lX: no hay subclave para el paquete de revocaci�n de subclave\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "clave %08lX: no hay subclave que unir\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
+msgstr "no uede poner datos de notaci�n en claves v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
+msgstr "no puede poner URL de pol�tica en firmas v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
+"no puede poner URL de pol�tica en firmas de claves v3 (estilo PGP 2.x)\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: no puedo expandir el %% de la url de pol�tica . Se usa sin expandir.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "firma %s de: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
@@ -4146,11 +4212,11 @@ msgstr ""
 "forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
@@ -4354,35 +4420,34 @@ msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "por favor haga un --check-trustdb\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "clave p�blica %08lX no encontrada: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
+msgstr "no se encuentran claves totalmente fiables\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
@@ -4390,7 +4455,7 @@ msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -4995,9 +5060,8 @@ msgid "Is this photo correct (y/N/q)? "
 msgstr "�Es correcta la foto? (s/n) "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "imposible establecer camino de ejecutables %s\n"
+msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
@@ -5151,33 +5215,33 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "�Es correcto? "
 
@@ -5222,6 +5286,9 @@ msgstr "error econtrando registro de confianza: %s\n"
 msgid "read error: %s\n"
 msgstr "error de lectura: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "este servidor de claves no es totalmente compatible con HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr ""
 #~ "El uso de este algoritmo est� desaconsejado - �crear de todas formas?"
@@ -5388,9 +5455,6 @@ msgstr "error de lectura: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "error leyendo clave primaria para el LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fallida: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "clave %08lX: petici�n de registro fallida\n"
 
@@ -5403,9 +5467,6 @@ msgstr "error de lectura: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enumeraci�n de claves secretas fallida: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "clave %08lX.%lu: uni�n de subclave v�lida\n"
 
diff --git a/po/et.po b/po/et.po
index 3b0c3d8da..6050ea83b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-04-27 16:51+0300\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-18 18:13+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "v�lju"
 
@@ -272,62 +272,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -357,6 +357,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "s�numil�hendi algoritm `%s' ei ole selles versioonis muudetav\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -366,7 +371,7 @@ msgstr ""
 "Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
 "mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -374,163 +379,163 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[failid]|kr�pteeri failid"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "ainult salvesta"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[failid]|dekr�pteeri failid"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "allkirjasta v�ti mitte-t�histatavana"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "n�ita ainult pakettide j�rjendeid"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse v��rtused"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend lahti"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -540,195 +545,195 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "�ra kasuta v3 allkirju"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "kasuta v4 v�tme allkirju"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "�ra kasuta v3 v�tme allkirju"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "kr�ptimisel �ra kasuta kunagi MDC"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "loe v�tmed failist"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Esita foto IDd"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Sea k�surida foto ID vaatamiseks"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +741,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,15 +761,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +779,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,317 +787,351 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "%s ei ole moodis %s lubatud.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1100,19 +1139,19 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
@@ -1252,7 +1291,7 @@ msgstr ""
 "Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                 ka \""
 
@@ -1310,7 +1349,7 @@ msgstr " j = j�ta see v�ti vahele\n"
 msgid " q = quit\n"
 msgstr " v = v�lju\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
@@ -1565,7 +1604,7 @@ msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -1583,7 +1622,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Loon ikka? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -1789,27 +1828,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1817,16 +1856,16 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1838,7 +1877,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1850,53 +1889,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1905,32 +1944,32 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, 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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, 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:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
@@ -1949,17 +1988,17 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K moodi t�ttu ei saa s�mmeetrilist ESK paketti kasutada\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: t�hi fail\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
@@ -1974,13 +2013,13 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -1991,337 +2030,337 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
+msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
+msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, 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"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "M�RKUS: Tuvastasin Elgamal primaarv�tme - importimine v�ib v�tta m�ne aja\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
@@ -2329,17 +2368,17 @@ msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
@@ -2347,17 +2386,17 @@ msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
@@ -2366,54 +2405,54 @@ msgstr "v�ti %08lX: j�tsin alamv�tme vahele\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
@@ -2467,20 +2506,27 @@ msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Kasutaja ID \"%s\" on t�histatud."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "HOIATUS: kasutaja ID \"%s\" pole ise allkirjastatud.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2489,11 +2535,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2502,13 +2548,13 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2517,54 +2563,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2574,31 +2620,31 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (vaikimisi)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2606,7 +2652,7 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2614,7 +2660,7 @@ msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2622,7 +2668,7 @@ msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2630,7 +2676,7 @@ msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2638,7 +2684,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2646,7 +2692,7 @@ msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2654,7 +2700,7 @@ msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2662,7 +2708,7 @@ msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2670,34 +2716,34 @@ msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2705,7 +2751,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2713,493 +2759,491 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "lisa foto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primaarne"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "l�lita"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "revkey"
+msgstr "[t�histatud] "
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "expire"
+msgstr "[aegunud] "
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3207,7 +3251,13 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3216,45 +3266,45 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 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:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3263,84 +3313,83 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
+msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
+msgstr ""
+"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3349,7 +3398,7 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3358,56 +3407,56 @@ msgstr ""
 "\"\n"
 "lokaalselt allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
@@ -3416,12 +3465,12 @@ msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -3450,34 +3499,34 @@ msgstr "Allkirja noteerimine: "
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
@@ -3582,80 +3631,87 @@ msgstr "allkirja kontroll j�eti �ra\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Abiinfo puudub"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
-msgstr "See allkiri aegub %s.\n"
+msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "See allkiri aegub %s.\n"
+msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s allkiri kasutajalt: \"%s\"\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "primaarne"
+msgstr "binaarne"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "tekstimood"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "tundmatu versioon"
+msgstr "tundmatu"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -3697,12 +3753,17 @@ msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "see teade ei pruugi olla programmiga %s kasutatav\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -3901,8 +3962,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "see v�tmeserver pole t�iesti HKP �hilduv\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -3993,33 +4054,35 @@ msgstr "eeldan tundmatu kriitilise biti t�ttu v�tmel %08lX vigast allkirja\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "v�ti %08lX: alamv�tme t�histamise paketile puudub alamv�ti\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
+msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) allkirja lisada\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
+msgstr "noteerimise infot ei saa v3 (PGP 2.x stiilis) v�tme allkirja lisada\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "HOIATUS: noteerimise %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
+msgstr "poliisi URLi ei saa v3 (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
+msgstr "poliisi URLi ei saa v3 v�tme (PGP 2.x) allkirjadesse panna\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4027,22 +4090,22 @@ msgstr ""
 "HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
 "kompaktset.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
@@ -4058,11 +4121,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
@@ -4264,35 +4327,34 @@ msgstr "trustdb: sync eba�nnestus: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "palun tehke --check-trustdb\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
+msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
@@ -4300,7 +4362,7 @@ msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -4899,9 +4961,8 @@ msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto �ige (j/E/v)? "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
+msgstr "foto ID ei saa n�idata!\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
@@ -5059,33 +5120,33 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "On see h�sti? "
 
@@ -5129,3 +5190,43 @@ msgstr "viga usalduse kirje otsimisel: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "viga lugemisel: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "see v�tmeserver pole t�iesti HKP �hilduv\n"
+
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
+
+#~ 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"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr ""
+#~ "punktid noteerimise nimes peavad olema �mbritsetud muude s�mbolitega\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ "         Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "HOIATUS: Selles v�tmes on foto ID. J�rgmise foto ID lisamine v�ib\n"
+#~ "         tekitada m�ningates PGP versioonides segadust.\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "V�tmega v�ib olla seotud ainult �ks foto ID.\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "S�rmej�lg:"
+
+#~ msgid "             Fingerprint:"
+#~ msgstr "               S�rmej�lg:"
+
+#~ msgid "you have to start GnuPG again, so it can read the new options file\n"
+#~ msgstr ""
+#~ "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
+
+#~ msgid "changing permission of  `%s' failed: %s\n"
+#~ msgstr "`%s' �iguste muutmine eba�nnestus: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 7dd7c2fa6..490edcd81 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.1\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-30 18:37+0200\n"
 "Last-Translator: Jouni Hiltunen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "lopeta"
 
@@ -271,64 +271,64 @@ msgstr "...t�m� on virhe (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "olet l�yt�nyt virheen ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "entropian ker�ysmodulia ei haittavissa\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "\"`%s': %s\" avaaminen ei onnistu\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s': %s ei voida lausua\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole normaali tiedosto - j�tet��n huomiotta\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed tiedosto on tyhj�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed tiedosto on v��r�n kokoinen\n"
 "- tiedostoa ei k�ytet�\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s': %s ei voida lukea\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "random_seed tiedostoa ei p�ivitetty\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s': %s ei voida luoda\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"`%s': %s\" ei voida kirjoittaa.\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"`%s': %s\" ei voida sulkea.\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: k�ytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -358,6 +358,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "Tiivistealgoritmi `%s' on read-only t�ss� versiossa\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -367,7 +372,7 @@ msgstr ""
 "Ole hyv� ja odota, entropiaa ker�t��n. Tee t�it� jos se\n"
 "auttaa kuluttamaan aikaa, koska se parantaa entropian laatua\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -375,163 +380,163 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|luo allekirjoitus"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "[tiedosto]|luo selkotekstinen allekirjoitus"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "luo irrallinen allekirjoitus"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[tiedostot]|salaa tiedostot"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisell� salaimella"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "vain tallennus"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[tiedostot]|avaa tiedostot"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "n�yt� avaimet"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "n�yt� avaimet allekirjoituksineen"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "n�yt� avaimet sormenj�lkineen"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "n�yt� salaiset avaimet"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten nipusta"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten nipusta"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "allekirjoita avain ilman mahdollisuutta peruuttaa"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "allekirjoita avain paikallisesti ilman mahdollisuutta peruuttaa"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "allekirjoita tai editoi avainta"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "luo peruutus (revokaatio) varmenne"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "tuo avaimia palvelimelta"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "etsi avaimia palvelimelta"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "p�ivit� avain palvelimelta"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "tuo/sulauta avaimia"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "luettele vain pakettien j�rjestys"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "vie luottamusasteet"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "tuo luottamusasteet"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "p�ivit� luottamussuhdetietokanta"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "valvomaton luottamussuhdetietokannan p�ivitys"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "korjaa korruptoitunut luottamus tietokanta"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Avaa tekstitiedosto tai stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Salaa tekstitiedosto tai stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -541,197 +546,197 @@ msgstr ""
 "Vaihtoehdot:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "luo ascii-muotoinen salattu tuloste"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle |NIMI|"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|oletusvastaanottaja on NIMI"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "k�yt� t�t� oletusavainta vastaanottajan oletusarvona"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "k�yt� t�t� k�ytt�j�tunnusta allekirjoituksiin \n"
 "ja salauksen avaamiseen"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta tiivistys N:n (0 poistaa k�yt�st�)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "k�yt� tekstimuotoa"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "k�yt� tulostustiedostona"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "ole jonkin verran hiljaisempi"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "�l� k�yt� lainkaan terminaalia"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "k�yt� v3 allekirjoituksia"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "�l� vaadi v3 allekirjoituksia"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "k�yt� v4 allekirjoituksia"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "�l� vaadi v3 allekirjoituksia"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "K�yt� aina MDC:t� salaamiseen"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "�l� koskaan k�yt� MDC:t� salaamiseen"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "�l� tee muutoksia"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "kysy ennen p��llekirjoitusta"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "k�yt� gpg-agent:ia"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "batch-tila: �l� kysy milloinkaan"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "oleta my�nteista vastausta useimpiin kysymyksiin"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "oleta kielteist� vastausta useimpiin kysymyksiin"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "lis�� t�m� avainnippu avainnippujen luetteloon"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "lis�� t�m� salainen avainnippu luetteloon"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "n�yt� mihin avainnippuun tulostettu avain kuuluu"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|k�yt� NIMI salaista avainta oletusarvona"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|PALVELIN|k�yt� t�t� palvelinta avainten etsimiseen"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|aseta NIMI terminaalin merkist�ksi"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "lue ehdot tiedostosta"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|statustiedot kirjoitetaan FD:n"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[tiedosto]|kirjoita statustiedot tiedostoon"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|AVAIN_ID|luota ehdottomasti t�h�n avaimeen"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduli TIEDOSTO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "j�ljittele RFC1991:ss� kuvattua toimintamuotoa"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "aseta kaikki paketti- salain- ja tiivistevaihtoehdot OpenPGP muotoon"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "aseta kaikki paketti-, salain- ja tiivistevaihtoehdot PGP 2.x muotoon"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|k�yt� tunnussanoissa N toimintoa"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|k�yt� NIMI salausalgoritmia salasanoihin"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|k�yt� NIMI salausalgoritmia salasanoihin "
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI| k�yt� NIMI salausalgoritmia"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|k�yt� viesteiss� NIMI tiivistealgoritmia"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|k�yt� N tiivistealgoritmia"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "lis�� avain-id kentt� salattuihin paketteihin"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "n�yt� kuvalliset tunnukset"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "�l� n�yt� kuvallisia tunnuksia"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Aseta komentotulkki kuvallisien tunnuksien katsomista varten"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -739,7 +744,7 @@ msgstr ""
 "@\n"
 "(Katso t�ydellinen luettelo kaikista komennoista ja ehdoista man-sivuilta)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -757,15 +762,15 @@ msgstr ""
 "--list-keys [nimet]          n�yt� avaimet\n"
 "--fingerprint [nimet]        n�yt� sormenj�ljet\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Kerro virheist� (englanniksi) <[email protected]>\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "K�ytt� gpg [ehdot] [tiedostot] (-h saadaksesi ohjeita)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +780,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu sy�tetyst� tiedosta\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,319 +788,353 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Julkinen avain"
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Salain "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "k�ytt�: gpg [ehdot]"
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "= merkki� ei l�ytynyt ryhm�m��rityksessa \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Varoitus omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Varoitus: oikeudet kohteessa %s \"%s\" eiv�t ole turvallisia\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eiv�t ole turvallisia\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Varoitus: Hakemiston %s \"%s\" oikeudet eiv�t ole turvallisia\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Huom: Vanhat oletusarvoiset asetukset l�ytyv�t tiedostosta `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Huom: Ehdot l�ytyv�t oletusarvoisesti tiedostosta `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valitsin-tiedosto `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan valitsimet tiedostosta `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eiv�t ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei kelpaa merkist�ksi\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "avainpalvelimen URI:t� ei voitu koota\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: tuontivalitsimet eiv�t kelpaa\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "tuontivalitsimet eiv�t kelpaa\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vientivalitsimet eiv�t kelpaa\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "vientivalitsimet eiv�t kelpaa\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voitu asettaa\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Huom: %s ei k�ytet� normaalisti!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ei ole sallittu samanaikaisesti kuin %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s k�ytt� samanaikaisesti on j�rjet�nt�!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "irrallinen allekirjoitus voidaan luoda vain --pgp2 tilassa\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 tilassa ei voida allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee k�ytt�� tiedostoja (eik� putkitusta) kun --pgp2 on otettu "
 "k�ytt��n.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2 tilassa vaatii IDEA salaimen\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "%s ei kenties voi k�sitell� t�t� viesti�\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salain-algoritmi ei kelpaa\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistysalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistysalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "tiivistysalgoritmin t�ytyy olla v�lilt� %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed t�ytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed t�ytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depht tulee olla v�lill� 1-255\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Huom: yksinkertaista S2K tilaa (0) ei suositella k�ytett�v�ksi\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K tila ei kelpaa, arvon tulee olla 0, 1 tai 3\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level arvo ei kelpaa, arvon tulee olla 0, 1 tai 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "oletusarvoiset valinnat eiv�t kelpaa\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "henkil�kohtaisen salaimen valinnat eiv�t kelpaa\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "henkil�kohtaiset tiivisteen  valinnat eiv�t kelpaa\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "henkil�kohtaiset tiivistysvalinnat eiv�t kelpaa\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Komentoa %s ei sallita %s tilassa.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Komentoa %s ei sallita %s tilassa.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Komentoa %s ei sallita %s tilassa.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanntottajia (-r) annettu k�ytt�m�tt� julkisen avaimen "
 "salausta\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key k�ytt�j�tunnus"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key k�ytt�j�tunnus"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrlsign-key k�ytt�j�tunnus"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key k�ytt�j�tunnus"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key k�ytt�j�tunnus [komennot]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s: %s avaus ei onnistu\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [k�ytt�j�tunnus] [avainnippu]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Avaimen luonti ep�onnistui: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "salaisten avainten enumerointi ep�onnistui: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Avaimen luonti ep�onnistui: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record ep�onnistui: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "salaisten avainten enumerointi ep�onnistui: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "tekstin avaaminen ep�onnistu: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "salaaminen tekstimuotoon ep�onnistui: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "tiivistealgoritmi `%s' ei kelpaa\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' avaaminen ei onnistu\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1103,19 +1142,19 @@ msgstr ""
 "notaation nimen t�ytyy sis�lt�� vain tulostettavia merkkej� tai v�lily�ntej� "
 "sen t�ytyy loppua merkkiin '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "k�ytt�j�tunnuksen notaationimen t�ytyy sis�lt�� '@'-merkki\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkej�\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "varmenne ohjeistuksen URL ei kelpaa\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "allekirjoitus ohjeistuksen URL ei kelpaa\n"
 
@@ -1258,7 +1297,7 @@ msgstr ""
 "Luottamusarvoa ei ole asetettu seuraavalle:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                aka \""
 
@@ -1316,7 +1355,7 @@ msgstr "o = ohita t�m� avain\n"
 msgid " q = quit\n"
 msgstr "l = lopeta\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Valintasi?"
 
@@ -1583,7 +1622,7 @@ msgstr "    (%d) RSA (vain salaus)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "    (%d) RSA (salaus ja allekirjoitus)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -1601,7 +1640,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Haluatko luoda avaimen kaikesta huolimatta?"
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -1806,27 +1845,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�l� sy�t� e-mail osoitetta nimen tai huomautuksen paikalle\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnHhEeOoLl"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (E)mail vai (L)opeta?"
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuta (N)imi, (H)uomautus, (E)mail vai (O)k/(L)opeta?"
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Ole hyv� ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1834,16 +1873,16 @@ msgstr ""
 "Tarvitset salasana suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yrit� uudestaan."
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1855,7 +1894,7 @@ msgstr ""
 "t�m�n ohjelman ehdolla \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1867,53 +1906,53 @@ msgstr ""
 "alkulukujen luomisen aikana, t�m� antaa satunnaislukugeneraattorille\n"
 "paremman tilaisuuden ker�t� riitt�v�sti entropiaa.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA avainparissa on 1024 bitti�.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti peruutettu.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "julkista avainnippua ei l�ydy kirjoittamista varten. %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "salaista avainnippua ei l�ydy kirjoittamista varten: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainnippuun `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainnippuun `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "Julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "Avain on m��ritelty ehdottoman luotettavaksi:\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1921,12 +1960,12 @@ msgstr ""
 "Huom. t�t� avainta ei voida k�ytt�� salaamiseen. K�yt� komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen t�h�n tarkoitukseen.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti ep�onnistui: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1934,7 +1973,7 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunu aikahyppy tai\n"
 "kellon kanssa on ongelmia\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1942,15 +1981,15 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Huom: v3 aliavainten luonti ei ole OpenPGP mukaista\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Haluatko todella luoda?"
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdess� t�m�n komennon kanssa\n"
 
@@ -1969,17 +2008,17 @@ msgstr "virhe luotaess salasanaa: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "symmetrist� ESK pakettia ei voida k�ytt�� S2K tilan vuoksi\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s on jo tiivistetty\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VAROITUS: tiedosto on tyhj�\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 tilassa voidaan salata vain 2048 tai pienemmill� RSA avaimilla\n"
@@ -1994,12 +2033,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kaikille salattaville avaimille ei voida k�ytt�� IDEA salainta.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "symmetrist� salainta %s (%d) ei l�ydy vastaanottajan valinnoista\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %s %d ei l�ydy vastaanottajan valinnoista\n"
@@ -2009,342 +2048,342 @@ msgstr "HUOM: salausalgoritmia %s %d ei l�ydy vastaanottajan valinnoista\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "Komentoa %s ei sallita %s tilassa.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "avainta '%s' ei l�ydetty: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "avain %08lX: avain ei noudata rcf2440:aa avain ohitettu\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "avain %08lX. ei suojattu - ohitetaan\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x muotoinen avain ohitetaan\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mit��n ei viety\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk v�limuistissa on liian monta kohdetta - poistettu k�yt�st�\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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[k�ytt�j�tunnus ei l�ytynyt]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ep�p�teva avain %08lX m��ritelty p�tev�ksi \n"
 "ehdolla --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "Julkiselle avaimelle \"%s\" l�ytyy vastaava salainen avain!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "k�ytet��n toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan %d tyyppinen lohko\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "t�h�n menness� k�sitelty %lu avainta\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan k�sitely: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "      ilman k�ytt�j�tunnuksia: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "         tuotu: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "         muuttamatta: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        uusia k�ytt�j�tunnuksia: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "         uusia alaiavaimia: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    uusia avainten peruutuksia (revokaatioita): %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "         luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "         %lu ei tuotu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "HUOM: Elgamal tyyppinen ensisijainen avain havaittu - tuominen voi\n"
 "vied� aikaa\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "avain %08lX: ei k�ytt�j�tunnusta\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "avain %08lX HKP aliavainvirhe korjattu\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "avain %08lX: k�ytt�j�tunnus '%s' hyv�ksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassa olevia k�ytt�j�tunnuksia\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "t�m�n voi aiheuttaa puuttuva oma-allekeirjoitus\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei l�ydetty. %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "avain %08lX: uusi avain ohitetaan\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "avainnippuun: %s ei voida kirjoittaa\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avinnippuun `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperaist� avainlohkoa ei l�ydy: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuper�isen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi k�ytt�j�tunnus\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta k�ytt�j�tunnusta\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "salainen avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on ep�p�tev� salain %d - ohitetaan\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaisten avainten nipulle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainnipussa\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei l�ydy: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - peruutus (revokaatio)\n"
 " varmennetta ei voida k�ytt��\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: p�tem�t�n peruutus (revokaatio) varmenne: %s - torjuttu\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: \"%s\" peruutus (revokaatio) varmenne tuotu\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "avain %08lX: k�ytt�j�tunnuksella ei ole allekirjoitusta\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "avain %08lX: p�tem�t�n oma-allekirjoitus \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "avain %08lX: p�tem�t�n aliavainriippuvuus\n"
@@ -2352,17 +2391,17 @@ msgstr "avain %08lX: p�tem�t�n aliavainriippuvuus\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten peruuttamista varten\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "avain %08lX: aliavaimen peruutus (revokaatio) ei ole p�tev�\n"
@@ -2370,17 +2409,17 @@ msgstr "avain %08lX: aliavaimen peruutus (revokaatio) ei ole p�tev�\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "avain %08lX: k�ytt�j�tunnus ohitettu '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
@@ -2389,58 +2428,58 @@ msgstr "avain %08lX: aliavain ohitettu\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida vied� (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "avain %08lX: peruutus (revokaati) varmenne v��r�ss� paikassa - ohitetaan\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "avain %08lX: peruutus (revokaatio) varmenne ei kelpaa: %s - ohitetaan\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus v��r�ss� paikassa - ohitetaan\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: kaksinkertainen k�ytt�j�tunnus havaittu - sis�llytet��n\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Varoitus: avain %08lX sattaa olla peruutettu: haetaan peruutusavain %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Varoitus: avain %08lX saattaa olla peruutettu: peruutusavain %08lX ei "
 "saatavilla.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\" peruutus (revokaatio) varmenne lis�tty\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "avain %08lX: lis�ttiin suora allekirjoitus\n"
@@ -2498,20 +2537,27 @@ msgstr ""
 msgid "User ID \"%s\" is revoked."
 msgstr "K�ytt�j�tunnus \"%s\" on peruutettu(revokoitu)."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Oletko varma ett� haluat allekirjoittaa (k/E)?"
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "K�ytt�j�tunnus \"%s\" on peruutettu(revokoitu)."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "VAROITUS: K-b�ytt�j�tunnus \"%s\" on tyhj-A� tiedosto\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2520,13 +2566,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "in PGP2.x-tyylinen allekirjoitus\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen t�ysin vientikelpoiseksi OpenPGP allekirjoitukseksi? "
 "(k/E)"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2535,13 +2581,13 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen vanhentunut.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko korvata vanhan allekirjoituksen uudella (k/E)"
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2550,45 +2596,45 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen t�ysin vientikelpoiseksi\n"
 "allekirjoitukseksi? (k/E)"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Oletko varma ett� haluat allekirjoittaa kaikesta huolimatta (k/E)?"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Avaimelle %08lX ei l�ydy mit��n mit� allekirjoittaa\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "T�m� avain on vanhentunut!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhentuu %s..\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenentuvan samaan aikaan (K/e)"
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2596,11 +2642,11 @@ msgstr ""
 "Et voi luoda OpenPGP allekirjoitusta PGP 2.x avaimella \n"
 "--pgp2 tilassa\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "T�m� tekisi avaimesta k�ytt�kelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2609,31 +2655,31 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkil�llisyyden?\n"
 "Jos et tied� vastausta, sy�t� \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "(0) En vastaa.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr "(oletusarvo)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "(1) En ole tarkistanut.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "  (2) Olen suorittanut pintapuolisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "  (3) olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2641,7 +2687,7 @@ msgstr ""
 "Oletko varma ett� haluat allekirjoittaa t�m�n\n"
 "avaimen omalla avaimellasi:"
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2649,7 +2695,7 @@ msgstr ""
 "\n"
 "t�m�n tulee olemaan oma-allekeirjoitus\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2657,7 +2703,7 @@ msgstr ""
 "\n"
 "VAROITUS: T�m� allekirjoitus m��ritell��n ei-vientikelpoiseksi.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2665,7 +2711,7 @@ msgstr ""
 "\n"
 "VAROITUS: T�m� allekirjoitus m��ritell��n ei-peruutettavaksi.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2673,7 +2719,7 @@ msgstr ""
 "\n"
 "T�m� allekirjoitus m��ritell��n ei-vientikelpoiseksi.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2681,7 +2727,7 @@ msgstr ""
 "\n"
 "T�m� allekirjoitus m��ritell��n ei-peruutettavaksi.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2689,7 +2735,7 @@ msgstr ""
 "\n"
 "En ole tarkistanut t�t� avainta lainkaan.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2697,7 +2743,7 @@ msgstr ""
 "\n"
 "Olen tarkistanut avaimen pintapuolisesti.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2705,34 +2751,34 @@ msgstr ""
 "\n"
 "Olen tarkistanut avaimen huolellisesti.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Haluatko todella allekirjoittaa?"
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus ep�onnistui: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "ensisijaisen avaimen salaiset osat eiv�t ole saatavilla.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voida editoida avainta: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2740,7 +2786,7 @@ msgstr ""
 "Sy�t� uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2748,493 +2794,493 @@ msgstr ""
 "Et halua salasanaa - t�m� on todenn�k�isesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Haluatko todella tehd� t�m�n? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "siirret��n avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "ulos t�st� valikosta"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "l"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "tallenna"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "apua"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "n�yt� t�m� ohje"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "n�yt� sormenj�lki"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "n�yt� avaimet ja k�ytt�j�tunnukset"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "ktn"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "valitse k�ytt�j�tunnus N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "avain"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "valitse toissijainen avain N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "tarkista"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "n�yt� allekirjoitukset"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "allekirjoita"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "allekirjoita avain"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "allekirjoita avain ilman mahdollisuutta peruuttaa"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "allekirjoita avain paikallisesti ilman mahdollisuutta peruuttaa"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "lis�� k�ytt�j�tunnus"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "lis�� valokuva"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "Poista k�ytt�j�tunnus"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "lis�� toissijainen avain"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "lis�� peruutusavain"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "poista allekirjoitus"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "vanhenna"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "ensisijainen"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "merkitse k�ytt�j�tunnus ensisijaiseksi"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "vaihda"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "vaihda salaisten ja julkisten avainten luettelon v�lill�"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "n�yt� valinnat (ekspertti)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "n�yt� valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "n�yt� valinnat"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "p�ivit� valinnat"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "salasana"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "luota"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "peruallek"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "peru allekirjoitus"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "perutunn"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "peru k�ytt�j�tunnus"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "peruuta toissijainen avain"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "poista k�yt�st�"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "poista avain k�yt�st�"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "ota avain k�ytt��n"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "n�yt� valokuva"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "t�t� ei voi tehd� batch-tilassa\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Komento>"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "T�h�n tarvitaan salainen avain\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�yt� ensin komentoa \"vaihda\".\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Avain on peruutettu."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Haluatko todella allekirjoittaa kaikki k�ytt�j�tunnukset?"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: valitse allekirjoitettavat k�ytt�j�tunnukset\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "T�t� komentoa ei sallita %s tilassa.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun t�ytyy valita ainakin yksi k�ytt�j�tunnus!\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeist� k�ytt�j�tunnusta!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Haluatko todella poistaa kaikki valitut k�ytt�j�tunnukset?"
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Haluatko todella poistaa t�m�n k�ytt�j�tunnuksen?"
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Sunu t�ytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Haluatko todella poistaa valitut avaimet?"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Haluatko todella poistaa t�m�n avaimen?"
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Haluatko todella peruuttaa kaikki valitut k�ytt�j�tunnukset?"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Haluatko todella peruuttaa t�m�n k�ytt�j�tunnuksen?"
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Haluatko todella peruuttaa (revokoida) valitut avaimet?"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Haluatko todella peruuttaa (revokoida) t�m�n avaimen?"
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Haluatko todella p�ivitt�� valinnat n�ille k�ytt�j�tunnuksille?"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Haluatko todella p�ivitt�� valinnat? (k/E)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Tallenna muutokset?"
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "p�ivitys ep�onnistui: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen p�ivitys ep�onnistui: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "P�ivityst� ei tarvita koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"apua\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "t�m� avain voidaan peruutta avaimella %s"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (luottamuksellinen)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX luotu :%s vanhentuu: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr "luota: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "T�m� avain on poistettu k�yt�st�"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! aliavain on peruutettu (revokoitu): %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- v��rennetty peruutus (revokaatio) l�ydetty\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? peruutuksen (revokaation) tarkistuksessa on ongelmia: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "vanhenna"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-tyyliselle k�ytt�j�tunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3242,7 +3288,13 @@ msgstr ""
 "Huomioi ett� t�ss� n�ytetty voimassaolo ei ole v�ltt�m�tt�\n"
 "ajan tasalla jollet k�ynnist� ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3252,45 +3304,45 @@ msgstr ""
 "saada\n"
 "        jotkin PGP:n versiot hylk��m��n avaimen.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Oletko varma ett� haluat lis�t� sen (k/E)?"
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lis�t� valokuvaa PGP2-muotoiseen avaimeen.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko t�m� voimassa oleva allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko t�m� ep�kelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko t�m� tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Haluatko todella poistaa oman allekirjoituksen? (k/E)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Mit��n ei poistettu.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3301,84 +3353,84 @@ msgstr ""
 "saada\n"
 "        jotkin PGP:n versiot hylk��m��n avaimen.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lis�t� m��r�tty� peruuttajaa PGP2-muotoiseen avaimeen.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sy�t� m��r�tyn peruuttajan k�ytt�j�tunnus"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x avainta ei voi asettaa m��r�tyksi peruuttajaksi\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ei voi asettaa avainta omaksi m��r�tyksi peruuttajaksi\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ei voi asettaa avainta omaksi m��r�tyksi peruuttajaksi\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "ei voi asettaa avainta omaksi m��r�tyksi peruuttajaksi\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salasten avainten valinnat ole hyv�.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain ole hyv�.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muutetaan toissijaisen avaimen voimassaolop�iv��.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen voimassaolop�iv��.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 avainten voimassaolop�iv�� ei voi muuttaa\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "salaisesta avainnipusta ei l�ydy vastaavaa ellekirjoitusta\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse vain yksi k�ytt�j�tunnus!\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "ohitetaan v3 muotoinen oma-allekirjoitus k�ytt�j�tunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ilmaisimella %d ei l�ydy k�ytt�j�tunnusta\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ilmaisimella %d ei l�ydy toissijaista avainta\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "K�ytt�j�tunnus: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3387,7 +3439,7 @@ msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3396,56 +3448,56 @@ msgstr ""
 "\"\n"
 "allekirjoitettu paikallisesti avaimellasi %08lX %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "T�m� allekirjoitus vanhentui %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko todella peruuttaa (revokoida) sen? (k/E)"
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko t�lle alekirjoitukselle peruutus (revokaatio) varmenne (k/E)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat k�ytt�j�tunnukset: \n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "    %08lX allekirjoitti t�m�n %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "%08lX peruutti (revokoi) t�m�n %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olete peruuttamassa (revokoimassa) seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "    %08lX allekirjoitti t�m�n %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr "(ei vientikelpoinen)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Haluatko todella luoda peruutus (revokaatio) varmenteet? (k/E)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "K�ytt�j�tunnus \"%s\" on peruutettu(revokoitu)\n"
@@ -3454,14 +3506,14 @@ msgstr "K�ytt�j�tunnus \"%s\" on peruutettu(revokoitu)\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: k�ytt�j�tunnuksen allekirjoitus on p�iv�tty %d sekuntia "
 "tulevaisuudessa\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3492,34 +3544,34 @@ msgstr "Allekirjoitus notaatio:"
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Avainnippu"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [vanhenee: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenj�lki: "
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "      Aliavaimen sormenj�lki="
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenj�lki:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenj�lki="
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "      Avaimen sormenj�lki="
 
@@ -3627,81 +3679,90 @@ msgstr "allekirjoituksen varmistus vaiennetaan\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "n�it� allekirjoituksia ei voida k�sitell�\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "allekirjoitus loi %-*s k�ytt�en %s avaintunnus %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Ei ohjeita saatavilla"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "allekirjoitus EI T�SM�� l�hett�jall�\""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "vanhentunut allekirjouts l�hett�j�ll� \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Allekirjoitus t�sm�� l�hett�j�ll� \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "T�m� allekirjoitus vanhentui %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "T�m� allekirjoitus vanhentui %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allekirjoitus l�hett�j�lt�: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "ensisijainen"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "tuntematon versio"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Seuraavaa allekirjoitusta ei voida tarkistaa: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole irrallinen\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: Haittiin useita allekirjoituksia. Vain ensimm�inen tarkistetaan.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "irrallinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan mallinen (pgp 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ep�kelpo root paketti havaittu proc_tree():ss�\n"
 
@@ -3743,12 +3804,17 @@ msgstr "VAROITUS: \"%s\" vaihtoehdon k�ytt�� ei suositella.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "k�yt� sen sijaan ehtoa \"%s%s\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "%s ei kenties voi k�sitell� t�t� viesti�\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin k�sittely ei onnistu: %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alipaketilla tyyppi� %d on asetettu \"critical bit\"\n"
@@ -3946,8 +4012,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "virhe l�hett�ess� kohteeseen `%s': status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "t�m� avainpalvelin ei ole t�ysin HKP-yhteensopiva\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4045,32 +4111,37 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "avain %08lX: ei aliavainta avainten peruuttamiseen\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "PGP 2.x avainta ei voi asettaa m��r�tyksi peruuttajaksi\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "PGP 2.x avainta ei voi asettaa m��r�tyksi peruuttajaksi\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROITUS:  %%-expand ei onnistu (liian suuri). K�ytet��n laajentamatonta.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "PGP 2.x avainta ei voi asettaa m��r�tyksi peruuttajaksi\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4078,22 +4149,22 @@ msgstr ""
 "VAROITUS: ohjeistus url %%-expand ei onnistu (liian suuri). \n"
 "K�ytet��n laajentamatonta.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "allekirjoituksen tarkistus ep�onnistui: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s allekirjoitus l�hett�j�lt�: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: `%s' on tyhj� tiedosto\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "PGP2.x muotoisia avaimia voi allekirjoittaa vain --pgp2 tilassa\n"
 
@@ -4108,11 +4179,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "HUOM: tiivistesalgoritmia %s (%d) ei l�ydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "allekirjoitan:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x muotoisia avaimia voi allekirjoittaa tekstimuotoon \n"
@@ -4316,7 +4387,7 @@ msgstr "trustdb: syncronointi ep�onnistui: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -4329,22 +4400,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:t�\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "julkista avainta %08lX ei l�ydy: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei l�ytynyt\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei l�ytynyt\n"
@@ -4352,7 +4423,7 @@ msgstr "ehdottomasti luotettu julkinen avain %08lX ei l�ytynyt\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5111,33 +5182,33 @@ msgstr ""
 "kelvoton. Mutta varo: tulostusj�rjestelm�si voi tallentaa tietoa\n"
 "ja luovuttaa sen toisille!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valise peruutuksen (revokaation) syy:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Haluat luultavasti valita t�ss� %d)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sy�t� valinnainen kuvaus. Lopeta tyhj�ll� rivill�: \n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Peruutuksen (revokaation) syy: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Ei kuvausta)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Onko t�t� oikein?"
 
@@ -5182,6 +5253,9 @@ msgstr "virhe luettaessa luottotietuetta %s\n"
 msgid "read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "t�m� avainpalvelin ei ole t�ysin HKP-yhteensopiva\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "T�m�n algoritmin k�ytt�� kehotetaan v�ltt�m��n - luonko silti?"
 
@@ -5323,9 +5397,6 @@ msgstr "lukuvirhe: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "virhe luettaessa ensisijaista avainta kohteelle LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record ep�onnistui: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "avain %08lX: kysely ep�onnistui\n"
 
@@ -5338,9 +5409,6 @@ msgstr "lukuvirhe: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "avaimen %08lX salainen ja julkinen avain eiv�t vastaa toisiaan\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "salaisten avainten enumerointi ep�onnistui: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "avain %08lX.%lu: aliavainten sitovuus on p�tev�\n"
 
diff --git a/po/fr.po b/po/fr.po
index 47764abf8..8d5000a33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-28 18:48+0300\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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "quitter"
 
@@ -279,65 +279,65 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -369,6 +369,11 @@ msgstr ""
 "l'algorithme de hachage `%s' ne marche que pour la lecture dans cette\n"
 "version\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -379,7 +384,7 @@ msgstr ""
 "faire autre chose pour ne pas vous ennuyer, car cela donnera une\n"
 "meilleure qualit� � l'entropie.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -387,167 +392,167 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[fichiers]|chiffrer les fichiers"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[fich.]|d�chiffrer les fichiers"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "signer une cl� irr�vocablement"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "signer une cl� localement et irr�vocablement"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "mise � jour inattendue de la base de confiance"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr ""
 "Enlever l'armure d'un fichier ou de\n"
 "l'entr�e standard"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr ""
 "Mettre une armure � un fichier ou �\n"
 "l'entr�e standard"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -557,202 +562,202 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "ne pas forcer les signatures en v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "forcer les signatures en v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "ne pas forcer les signatures en v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr ""
 "ne jamais utiliser de sceau pour le\n"
 "chiffrement"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "indiquer o� est une cl� list�e"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCL�|donner une confiance ultime � cette cl�"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Montrer les photos d'identit�"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Ne pas montrer les photos d'identit�"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Choisir la ligne de commande servant �\n"
 "afficher les photos d'identit�"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -760,7 +765,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -780,17 +785,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -800,7 +805,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:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -808,328 +813,362 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = signature trouv�e dans la d�finition du groupe \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
 "sont peu s�res\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, 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:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement \"%s\" n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, 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:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, 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:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "ce message ne sera pas utilisable par %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
 "ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "La g�n�ration de cl� a �chou�: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "La g�n�ration de cl� a �chou�: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "La g�n�ration de cl� a �chou�: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "La g�n�ration de cl� a �chou�: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1137,19 +1176,19 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
@@ -1292,7 +1331,7 @@ msgstr ""
 "Pas de confiance d�finie pour :\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "              alias \""
 
@@ -1349,7 +1388,7 @@ msgstr " s = sauter cette cl�\n"
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
@@ -1613,7 +1652,7 @@ msgstr "   (%d) RSA (chiffrement seul)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
@@ -1632,7 +1671,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Cr�er quand m�me ? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -1839,28 +1878,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1868,16 +1907,16 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1889,7 +1928,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1901,55 +1940,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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, 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:2244
+#: g10/keygen.c:2246
 #, 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:2258
+#: g10/keygen.c:2260
 #, 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:2265
+#: g10/keygen.c:2267
 #, 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:2285
+#: g10/keygen.c:2287
 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:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1958,13 +1997,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, 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:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1972,7 +2011,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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1980,16 +2019,16 @@ 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:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
@@ -2009,17 +2048,17 @@ msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "il n'est pas possible d'utiliser un paquet ESK sym�trique en mode S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
@@ -2037,14 +2076,14 @@ msgstr ""
 "impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
 "lesquelles vous chiffrez.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du r�cipient\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2056,343 +2095,343 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "cl� '%s' introuvable: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, 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"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTE: Cl� principale Elgamal d�tect�e - l'importation peut prendre un\n"
 "certain temps\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "cl� %08lX: corruption de sous-cl� HKP r�par�e\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "cl� %08lX: cl� publique \"%s\" import�e\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "cl� %08lX: \"%s\" un nouvel utilisateur\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "cl� %08lX: \"%s\" %d nouveaux utilisateurs\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "cl� %08lX: \"%s\" une nouvelle signature\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "cl� %08lX: \"%s\" %d nouvelles signatures\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "cl� %08lX: \"%s\" une nouvelle sous-cl�\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "cl� %08lX: \"%s\" %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "cl� %08lX: \"%s\" n'a pas chang�\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %08lX: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX: cl� secr�te import�e\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %08lX: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "cl� %08lX: \"%s\" certificat de r�vocation import�\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "cl� %08lX: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "cl� %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
@@ -2400,17 +2439,17 @@ msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "cl� %08lX: supressions de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "cl� %08lX: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "cl� %08lX: r�vocation de sous-cl� invalide\n"
@@ -2418,17 +2457,17 @@ msgstr "cl� %08lX: r�vocation de sous-cl� invalide\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "cl� %08lX: suppression de la r�vocation de sous-cl� multiples\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -2437,56 +2476,56 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "cl� %08lX: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %08lX: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
 "r�vocation %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
 "%08lX est absente.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "cl�: %08lX: \"%s\" certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
@@ -2540,22 +2579,29 @@ msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 "AVERTISSEMENT: le nom d'utilisateur \"%s\" ne comporte pas\n"
 "d'auto-signature.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2564,11 +2610,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2577,7 +2623,7 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
@@ -2585,7 +2631,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2594,43 +2640,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2638,11 +2684,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2652,31 +2698,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (par d�faut)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, 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:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2684,7 +2730,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2692,7 +2738,7 @@ msgstr ""
 "\n"
 "cela sera une auto-signature.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2700,7 +2746,7 @@ msgstr ""
 "\n"
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2709,7 +2755,7 @@ msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2717,7 +2763,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2725,7 +2771,7 @@ msgstr ""
 "\n"
 "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2733,7 +2779,7 @@ msgstr ""
 "\n"
 "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2741,7 +2787,7 @@ msgstr ""
 "\n"
 "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2749,40 +2795,40 @@ msgstr ""
 "\n"
 "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 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:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 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:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2791,496 +2837,496 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsigner"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "signer la cl� de fa�on non-r�vocable"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsigner"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "signer la cl� de fa�on locale et non-r�vocable"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "aj.photo"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "suppr.photo"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "aj.rev"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "principale"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 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:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "montr.pr�f"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "mettre.pr�f"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "donner la liste de pr�f�rences"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "pr�f.m�j"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "pr�f�rences mises � jour"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "r�voquer un nom d'utilisateur"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "montr.photo"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, 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:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 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:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 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:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sensible)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, 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:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, 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:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revcl�"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3288,7 +3334,13 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte � moins de relancer le programme.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3298,46 +3350,46 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3347,16 +3399,16 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
@@ -3365,20 +3417,20 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
@@ -3386,54 +3438,54 @@ msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur \"%s\" a �t� ignor�e\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3442,7 +3494,7 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3451,56 +3503,56 @@ msgstr ""
 "\"\n"
 "sign� localement avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   sign� par %08lX � %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   sign� par %08lX � %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
@@ -3509,14 +3561,14 @@ msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3546,34 +3598,34 @@ msgstr "Notation de signature: "
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr " Empreinte de la cl� ="
 
@@ -3680,66 +3732,75 @@ msgstr "v�rification de signature supprim�e\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Pas d'aide disponible"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Signature expir�e de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Signature %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "principale"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "version inconnue"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -3747,16 +3808,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -3800,12 +3861,17 @@ msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "ce message ne sera pas utilisable par %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, 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"
@@ -4012,8 +4078,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "ce serveur de cl�s n'est pas compl�tement compatible avec HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4114,39 +4180,44 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "cl� %08lX: pas de sous-cl� pour le paquet de r�vocation de sous-cl�\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVERTISSEMENT: impossible de faire une expansion � base de %%\n"
 "(cha�ne trop grande). Utilisation de la version non expans�e.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4154,22 +4225,22 @@ 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:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "Signature %s de: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
@@ -4187,11 +4258,11 @@ msgstr ""
 "forcer l'algorithme de chiffrement %s (%d) entre en d�saccord avec\n"
 "les pr�f�rences du r�cipient\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
@@ -4399,7 +4470,7 @@ msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, 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"
@@ -4412,22 +4483,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "cl� publique %08lX non trouv�e : %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, 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"
@@ -4435,7 +4506,7 @@ msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5208,33 +5279,33 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Est-ce d'accord ? "
 
@@ -5278,3 +5349,6 @@ msgstr "erreur pendant la recherche de l'enregistrement de confiance: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "erreur de lecture: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "ce serveur de cl�s n'est pas compl�tement compatible avec HKP\n"
diff --git a/po/gl.po b/po/gl.po
index 96ef99d5b..59ad5b7c3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-24 15:26+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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "abandonar"
 
@@ -272,62 +272,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,6 +359,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "o algoritmo de resumo `%s' � de s� lectura nesta versi�n\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -369,7 +374,7 @@ msgstr ""
 "pouco se iso evita que se aburra, que iso ha aumenta-la\n"
 "calidade da entrop�a.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -377,163 +382,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "s� armacenar"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|descifrar ficheiros"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "asinar unha chave de xeito non revocable"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "asinar unha chave localmente e de xeito non revocable"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar s� a secuencia de paquetes"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporta-los valores de confianza no propietario"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa-los valores de confianza no propietario"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualizaci�n inatendida da base de datos de confianza"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ama�ar unha base de datos de confianza corrompida"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Quita-la armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "P�r armadura a un ficheiro ou � entrada est�ndar"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -543,199 +548,199 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa-la chave por defecto coma o destinatario por defecto"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "forzar sinaturas v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "non forzar sinaturas v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "forzar sinaturas de chave v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "non forzar sinaturas de chave v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "sempre usar un MDC para cifrar"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "nunca usar un MDC para cifrar"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "emprega-lo gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "engadir este chaveiro secreto � lista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "le-las opci�ns dun ficheiro"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escribi-la informaci�n de estado no ficheiro"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCHAVE|confiar absolutamente nesta chave"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emula-lo modo descrito no RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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 PGP 2."
 "x"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo para resumos NOME para os contrasinais"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|emprega-lo algoritmo de compresi�n N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "descarta-lo campo de id de chave dos paquetes cifrados"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Non amosar Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Estabrece-la li�a de comando para ve-las Identificaci�ns Fotogr�ficas"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -743,7 +748,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -763,17 +768,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -783,7 +788,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -791,319 +796,353 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, 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:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "esta mensaxe pode non ser utilizable por %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "non se pode empregar %s no modo %s\n"
+
+#: g10/g10.c:2077
 #, 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:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "non se puido abrir %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "A xeraci�n da chave fallou: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "erro ao enumera-las chaves secretas: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "A xeraci�n da chave fallou: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record fallou: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "erro ao enumera-las chaves secretas: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1111,19 +1150,19 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
@@ -1264,7 +1303,7 @@ msgstr ""
 "Non se asignou un valor de confianza a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "               alias \""
 
@@ -1321,7 +1360,7 @@ msgstr " o = omitir esta chave\n"
 msgid " q = quit\n"
 msgstr " s = sa�r\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
@@ -1579,7 +1618,7 @@ msgstr "   (%d) RSA (s� cifrar)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (asinar e cifrar)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -1597,7 +1636,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "�Crear de t�dolos xeitos? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -1804,28 +1843,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1833,16 +1872,16 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1854,7 +1893,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1866,53 +1905,53 @@ 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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ha ter 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non se atopou un chaveiro p�blico no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 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:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada coma de confianza absoluta.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1921,12 +1960,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1934,7 +1973,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1942,15 +1981,15 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "�Crear realmente? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
@@ -1969,17 +2008,17 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "non se pode empregar un paquete sim�trico ESK debido ao modo S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro baleiro\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "s� pode cifrar a chaves RSA de 2048 bits ou menos en modo --pgp2\n"
 
@@ -1995,13 +2034,13 @@ msgstr ""
 "non se puido emprega-la cifra IDEA para t�dalas chaves �s que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2013,346 +2052,346 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: non � unha chave rfc2440 - omitida\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTA: Detectouse unha clave primaria Elgamal - ha tomar alg�n tempo "
 "importala\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
@@ -2360,17 +2399,17 @@ msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
@@ -2378,17 +2417,17 @@ msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
@@ -2397,56 +2436,56 @@ msgstr "chave %08lX: omitida a sub-chave\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@ -2500,20 +2539,27 @@ msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "O ID de usuario \"%s\" est� revocado."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID de usuario \"%s\" non est� asinado por el mesmo.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2522,11 +2568,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2535,13 +2581,13 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2550,54 +2596,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2606,31 +2652,31 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (por defecto)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2638,7 +2684,7 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2646,7 +2692,7 @@ msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2654,7 +2700,7 @@ msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2662,7 +2708,7 @@ msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2670,7 +2716,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2678,7 +2724,7 @@ msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2686,7 +2732,7 @@ msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2694,7 +2740,7 @@ msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2702,34 +2748,34 @@ msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 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:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2737,7 +2783,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2745,495 +2791,495 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "gardar"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "axuda"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "listar"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "selecciona-la chave secundaria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "verificar"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "listar sinaturas"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "asina-la chave"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "f"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "asina-la chave de xeito non revocable"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "asina-la chave localmente e de xeito non revocable"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "depurar"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "borrar un ID de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "engadir unha chave secundaria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "borrar sinaturas"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "preferencias actualizadas"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sensible)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creada: %s caduca: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! revocouse a subchave: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- atopouse unha revocaci�n falsa\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3241,7 +3287,13 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3250,47 +3302,47 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3300,16 +3352,16 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
@@ -3317,69 +3369,69 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3388,7 +3440,7 @@ msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3397,56 +3449,56 @@ msgstr ""
 "\"\n"
 "asinado localmente coa s�a chave %08lX no %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
@@ -3455,13 +3507,13 @@ msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3491,34 +3543,34 @@ msgstr "Notaci�n de sinaturas: "
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Chaveiro"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
@@ -3623,81 +3675,90 @@ msgstr "verificaci�n de sinatura suprimida\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Asinada o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Non hai axuda dispo�ible"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "versi�n desco�ecida"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -3741,12 +3802,17 @@ msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "esta mensaxe pode non ser utilizable por %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 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:1069
+#: g10/parse-packet.c:1083
 #, 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"
@@ -3945,8 +4011,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "fallo ao enviar a `%s': estado=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "este servidor de chaves non � totalmente compatible con HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4048,57 +4114,62 @@ msgstr ""
 "chave %08lX: non hai unha sub-chave para o paquete de a revocaci�n de "
 "subchave\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: non se pode expandir-%% a notaci�n (grande de m�is). �sase sen "
 "expandir.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
@@ -4115,11 +4186,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
@@ -4324,7 +4395,7 @@ msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -4337,22 +4408,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
@@ -4360,7 +4431,7 @@ msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5119,33 +5190,33 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "�� correcto? "
 
@@ -5190,6 +5261,9 @@ msgstr "erro ao buscar un rexistro de confianza: %s\n"
 msgid "read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "este servidor de chaves non � totalmente compatible con HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "Este algoritmo est� obsoleto - �crear de t�dolos xeitos? "
 
@@ -5349,9 +5423,6 @@ msgstr "erro de lectura: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "erro ao le-la chave primaria para o LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record fallou: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "chave %08lX: a consulta do rexistro fallou\n"
 
@@ -5364,9 +5435,6 @@ msgstr "erro de lectura: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "chave %08lX: as chaves secreta e p�blica non coinciden\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "erro ao enumera-las chaves secretas: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "chave %08lX.%lu: Ligadura de subchave correcta\n"
 
diff --git a/po/hu.po b/po/hu.po
index a2f63e16c..cdc9e1dc5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-24 23:12+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Nagy Ferenc L�szl� <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "nem"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "kil�p�s"
 
@@ -272,63 +272,63 @@ msgstr "Ez egy programhiba... (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Tal�lt egy programhib�t... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -358,6 +358,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "\"%s\" kivonatol� algoritmus csak olvashat� ebben a kiad�sban\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -367,7 +372,7 @@ msgstr ""
 "K�rem, v�rjon, entr�pi�t gy�jt�k! Vagy ink�bb csin�ljon k�zben valamit\n"
 "a g�pen, az az entr�pi�m min�s�g�t is jav�tani fogja!\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -375,163 +380,163 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[f�jlok]|�llom�nyok titkos�t�sa"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "csak t�rol�s"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[f�jlok]|�llom�nyok visszafejt�se"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "kulcs al��r�sa visszavonhatatlanul"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "kulcs al��r�sa helyileg �s visszavonhatatlanul"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "csak a csomagok list�z�sa"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "bizalmi �rt�kek exportja"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "bizalmi �rt�kek importja"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "bizalmi adatb�zis friss�t�se fel�gyelet n�lk�l"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "s�r�lt bizalmi adatb�zis kijav�t�sa"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "p�nc�l elt�vol�t�sa �llom�nyr�l vagy bemenetr�l"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "�llom�ny vagy bemenet p�nc�loz�sa"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -541,195 +546,195 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "alap�rt. kulcs haszn. alap�rt. c�mzettk�nt"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "3-as verzi�j� al��r�sok er�ltet�se"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "ne er�ltesse a 3-as verzi�j� al��r�sokat"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "4-es verzi�j� al��r�sok er�ltet�se"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "ne er�ltesse a 4-es verzi�j� al��r�sokat"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "mindig haszn�ljon MDC-t titkos�t�skor"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "soha ne haszn�ljon MDC-t titkos�t�skor"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "gpg �gyn�k haszn�lata"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "titkoskulcs-karika hozz�ad�sa a list�hoz"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|N�V|termin�l karakterk�dol�s�nak megad�sa"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "opci�k beolvas�sa �llom�nyb�l"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[f�jl]|�llapotinform�ci�k �llom�nyba �r�sa"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KULCS|alapvet�en megb�zunk ebben a kulcsban"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991-ben le�rt m�d emul�ci�ja"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "opci�k OpenPGP m�dra �ll�t�sa"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "opci�k PGP 2.x m�dra �ll�t�sa"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|N. sorsz�m� jelsz�m�d haszn�lata"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn. jelszavakhoz"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn. jelszavakhoz"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|N. sorsz�m� t�m�r�t� algoritmus haszn�lata"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "titkos�tott csomagok keyid mez�j�nek eldob�sa"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "fot�azonos�t�k mutat�sa"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "ne mutassa a fot�azonos�t�kat"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "parancssor �ll�t�sa fot�azonos�t�k megn�z�s�hez"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -737,7 +742,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -757,17 +762,17 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 "Ford�t�ssal kapcsolatban az <[email protected]> c�mre �rjon!\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -777,7 +782,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -785,316 +790,350 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "A t�m�r�t�algoritmus sz�ma %d �s %d k�z� kell essen!\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-check-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key felh-azonos�t�"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key felh-azonos�t�"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1102,19 +1141,19 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
@@ -1254,7 +1293,7 @@ msgstr ""
 "Nincs megb�zhat�s�gi �rt�k rendelve:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "               azaz \""
 
@@ -1312,7 +1351,7 @@ msgstr " h = kulcs kihagy�sa\n"
 msgid " q = quit\n"
 msgstr " k = kil�p�s\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
@@ -1570,7 +1609,7 @@ msgstr "   (%d) RSA (csak titkos�t�s)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (al��r�s �s titkos�t�s)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -1589,7 +1628,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "M�gis l�trehozzam? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -1796,28 +1835,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "K�rem, ne rakja az e-mail c�met a teljes n�vbe vagy a megjegyz�sbe!\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(N)�v, (M)egjegyz�s, (E)-mail megv�ltozat�sa vagy (K)il�p�s? "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(N)�v, (M)egjegyz�s, (E)-mail megv�ltozat�sa vagy (R)endben/(K)il�p�s? "
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1825,16 +1864,16 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1846,7 +1885,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1858,53 +1897,53 @@ msgstr ""
 "a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
 "gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" nyilv�noskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "A nyilv�nos �s titkos kulcsokat l�trehoztam �s al��rtam.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "A kulcsot alapvet�en megb�zhat�nak jel�ltem.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1913,35 +1952,35 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "MEGJEGYZ�S: Alkulcsok l�trehoz�sa v3 kulcsokhoz nem OpenPGP-megfelel�.\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
@@ -1960,17 +1999,17 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "Nem tudok szimmetrikus ESK csomagot haszn�lni a S2K m�d miatt!\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "FIGYELEM: \"%s\" �res �llom�ny.\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "Csak 2048 bites, vagy r�videbb RSA kulcsokkal titkos�that --pgp2 m�dban!\n"
@@ -1985,12 +2024,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "Nem tudom az IDEA rejtjelez�t haszn�lni az �sszes c�mzett kulcshoz.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
@@ -2000,339 +2039,339 @@ msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX kulcs: nem rfc2440 kulcs - kihagytam.\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
 #. 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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "               import�lva: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "MEGJEGYZ�S: Elgamal els�dleges kulcsot �rz�keltem.\n"
 "Eltarthat egy ideig az import�l�sa.\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azons�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
@@ -2340,17 +2379,17 @@ msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
@@ -2358,17 +2397,17 @@ msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
@@ -2377,56 +2416,56 @@ msgstr "%08lX kulcs: Alkulcsot kihagytam.\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
@@ -2480,20 +2519,27 @@ msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "FIGYELEM: \"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2502,11 +2548,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2515,13 +2561,13 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2530,54 +2576,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2586,31 +2632,31 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (alap�rtelmez�s)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2618,7 +2664,7 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2626,7 +2672,7 @@ msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2634,7 +2680,7 @@ msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2642,7 +2688,7 @@ msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2650,7 +2696,7 @@ msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2658,7 +2704,7 @@ msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2666,7 +2712,7 @@ msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2674,7 +2720,7 @@ msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2682,34 +2728,34 @@ msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2717,7 +2763,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2725,493 +2771,493 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "N. m�sodlagos kulcs kiv�laszt�sa"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "al��r�sok kilist�z�sa"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "kulcs al��r�sa"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "kulcs nem visszavonhat� al��r�sa"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "kulcs nem visszavonhat� helyi al��r�sa"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "m�sodlagos kulcs (alkulcs) hozz�ad�sa"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "al��r�sok t�rl�se"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "preferenci�k friss�t�se"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (�rz�keny)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  l�trehozva: %s lej�r: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Alkulcsot visszavont�k: %s.\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- Hamis visszavon�st tal�ltam!\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenic�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3219,7 +3265,13 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3229,45 +3281,45 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3277,85 +3329,85 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltozat�sa.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nincs %d index� m�sodlagos kulcs!\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3364,7 +3416,7 @@ msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3373,56 +3425,56 @@ msgstr ""
 "\"\n"
 "Helyileg al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s id�pontban.\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
@@ -3431,13 +3483,13 @@ msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@ -3466,34 +3518,34 @@ msgstr "Al��r�sjel�l�s: "
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Kulcskarika"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [lej�r: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Els�dleges kulcs ujjlenyomata:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcs ujjlenyomata:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Els�dleges kulcs ujjlenyomata:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "          Alkulcs ujjlenyomata:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
@@ -3601,82 +3653,91 @@ msgstr "Al��r�sellen�rz�s elnyomva.\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Al��r�s l�trehozva %.*s id�pontban,\n"
 "kulcs t�pusa: %s, azonos�t�: %08lX.\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nem �ll rendelkez�sre seg�ts�g."
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "ismeretlen verzi�"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -3719,12 +3780,17 @@ msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "Lehet, hogy ez az �zenet haszn�lhatatlan a %s sz�m�ra!\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -3928,8 +3994,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "Nem tudtam felk�ldeni %s kulcsszerverre. St�tusz: %u.\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "Ez a kulcsszerver nem teljesen HKP kompat�bilis.\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4027,33 +4093,38 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "%08lX kulcs: Nincs alkulcs az alkulcsvisszavon� csomaghoz.\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "FIGYELEM: Nem tudom kifejteni a %% jeleket a jel�l�sben (t�l hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4062,22 +4133,22 @@ msgstr ""
 "hossz�).\n"
 "Kifejt�s n�lk�l haszn�lom.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
@@ -4094,11 +4165,11 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
@@ -4301,7 +4372,7 @@ msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@ -4314,22 +4385,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
@@ -4337,7 +4408,7 @@ msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5105,33 +5176,33 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Ez �gy rendben van? "
 
@@ -5175,3 +5246,6 @@ msgstr "Hiba bizalmi rekord keres�sekor: %s.\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "Olvas�si hiba: %s.\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "Ez a kulcsszerver nem teljesen HKP kompat�bilis.\n"
diff --git a/po/id.po b/po/id.po
index 7564573b9..4f5d8c23f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-29 14:48GMT+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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "keluar"
 
@@ -274,62 +274,62 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,6 +359,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -369,7 +374,7 @@ msgstr ""
 "bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n"
 "kualitas entropi.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -377,163 +382,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -543,195 +548,195 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -739,7 +744,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -759,15 +764,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -777,7 +782,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -785,323 +790,357 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Pembuatan kunci gagal: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "gagal perbarui rahasia: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1109,19 +1148,19 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
@@ -1262,7 +1301,7 @@ msgstr ""
 "Tidak ada nilai trust untuk:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "              alias \""
 
@@ -1320,7 +1359,7 @@ msgstr " s = lewati kunci ini\n"
 msgid " q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
@@ -1576,7 +1615,7 @@ msgstr "  (%d) RSA (hanya enkripsi)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -1595,7 +1634,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -1801,27 +1840,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1829,16 +1868,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1851,7 +1890,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1863,53 +1902,53 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1918,34 +1957,34 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, 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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, 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:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
@@ -1964,17 +2003,17 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "tidak dapat menggunakan paket simetri ESK karena mode S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
@@ -1991,12 +2030,12 @@ msgid ""
 msgstr ""
 "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
@@ -2006,336 +2045,336 @@ msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "CATATAN: Kunci primer Elgamal terdeteksi - mungkin membutuhkan beberapa saat "
 "untuk mengimpor\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
@@ -2343,17 +2382,17 @@ msgstr "kunci %08lX: subkey binding tidak valid\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
@@ -2361,17 +2400,17 @@ msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -2380,54 +2419,54 @@ msgstr "kunci %08lX: melewati subkey\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@ -2481,20 +2520,27 @@ msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID \"%s\" dibatalkan."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "PERINGATAN: user ID \"%s\" bukan self-signed.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2503,11 +2549,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2516,7 +2562,7 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
@@ -2524,7 +2570,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2533,43 +2579,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2577,11 +2623,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2591,31 +2637,31 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (default)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2623,7 +2669,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2631,7 +2677,7 @@ msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2639,7 +2685,7 @@ msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2647,7 +2693,7 @@ msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2655,7 +2701,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2663,7 +2709,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2671,7 +2717,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2679,7 +2725,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2687,34 +2733,34 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2722,7 +2768,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2730,493 +2776,493 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3224,7 +3270,13 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3234,45 +3286,45 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3282,15 +3334,15 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
@@ -3298,20 +3350,20 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
@@ -3319,54 +3371,54 @@ msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3375,7 +3427,7 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3384,56 +3436,56 @@ msgstr ""
 "\"\n"
 "ditandai secara lokal dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
@@ -3442,12 +3494,12 @@ msgstr "User ID \"%s\" telah dibatalkan\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@ -3476,34 +3528,34 @@ msgstr "Notasi signature: "
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Keyring"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
@@ -3608,81 +3660,90 @@ msgstr "verifikasi signature tidak diabaikan\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Tidak tersedia bantuan"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primer"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "versi tidak dikenal"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -3726,12 +3787,17 @@ msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "pesan ini mungkin tidak dapat digunakan oleh %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -3930,8 +3996,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "failed sending to `%s': status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "keyserver ini tidak kompatibel penuh dengan HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4027,36 +4093,41 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan paket\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand notasi (terlalu besar).  "
 "Menggunakan yang tidak di-expand.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4064,22 +4135,22 @@ msgstr ""
 "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
 "Menggunakan yang tidak expand.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
@@ -4095,11 +4166,11 @@ msgstr "tidak dapat membuat %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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 --"
@@ -4302,7 +4373,7 @@ msgstr "trustdb: gagal sync: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -4315,22 +4386,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
@@ -4338,7 +4409,7 @@ msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, 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"
@@ -5109,34 +5180,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Ini oke? "
 
@@ -5181,5 +5252,8 @@ msgstr "kesalahan: gagal menemukan catatan trust: %s\n"
 msgid "read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "keyserver ini tidak kompatibel penuh dengan HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
diff --git a/po/it.po b/po/it.po
index 4b9f4b760..ff48bb0f0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-28 02:34+0200\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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "quit"
 
@@ -273,64 +273,64 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -361,6 +361,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "in questa versione l'algoritmo digest `%s' � in sola lettura\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -371,7 +376,7 @@ msgstr ""
 "po',\n"
 "visto che questo migliorer� la qualit� dell'entropia.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -379,163 +384,163 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[file]|cifra i file"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[file]|decifra i file"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "firma una chiave irrevocabilmente"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "firma una chiave localmente e irrevocabilmente"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "aggiornamento non presidiato del database della fiducia"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,197 +550,197 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "non forza l'uso di firme v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "non forza l'uso di firme v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "non usa mai un MDC per cifrare"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta NOME come set di caratteri del terminale"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[file]|scrivi le informazioni di stato nel file"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "imposta tutte le opzioni di pacchetto, cifrario e digest per PGP 2.x"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Mostra le fotografie"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Non mostra le fotografie"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Imposta la riga di comando per vedere le fotografie"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -743,7 +748,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -763,15 +768,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +786,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,322 +794,356 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "non � possibile usare %s in modalit� %s\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Generazione della chiave fallita: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "aggiornamento della chiave segreta fallito: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1112,19 +1151,19 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
@@ -1265,7 +1304,7 @@ msgstr ""
 "Nessun valore di fiducia assegnato a:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                alias \""
 
@@ -1323,7 +1362,7 @@ msgstr " s = salta questa chiave\n"
 msgid " q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
@@ -1579,7 +1618,7 @@ msgstr "   (%d) RSA (cifra solo)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (firma e cifra)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -1597,7 +1636,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "La creo lo stesso? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -1804,27 +1843,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1832,16 +1871,16 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1853,7 +1892,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1865,53 +1904,53 @@ 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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "chiavi marcate definitivamente affidabili.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1920,12 +1959,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1933,7 +1972,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1941,15 +1980,15 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NB: la creazione di sottochiavi per chiavi v3 non rispetta OpenPGP.\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
@@ -1969,17 +2008,17 @@ msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalit� S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "in modalit� --pgp2 puoi cifrare solo per chiavi RSA non pi� lunghe di 2048 "
@@ -1997,14 +2036,14 @@ msgstr ""
 "impossibile usare il cifrario IDEA con tutti i tipi di chiavi per cui\n"
 "stai cifrando.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2016,336 +2055,336 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTA: trovata una chiave primaria Elgamal - importarla pu� essere lungo\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla sottochiave\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
@@ -2353,17 +2392,17 @@ msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
@@ -2371,17 +2410,17 @@ msgstr "chiave %08lX: revoca della subchiave non valida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -2390,56 +2429,56 @@ msgstr "chiave %08lX: saltata la subchiave\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della sottochiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@ -2493,20 +2532,27 @@ msgstr "Trovati %d user ID senza autofirme valide\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "L'user ID \"%s\" � stato revocato."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "ATTENZIONE: l'user ID \"%s\" non � autofirmato.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2515,11 +2561,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2528,13 +2574,13 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2543,43 +2589,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2587,11 +2633,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2601,31 +2647,31 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (predefinito)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2633,7 +2679,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2641,7 +2687,7 @@ msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2649,7 +2695,7 @@ msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2657,7 +2703,7 @@ msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2665,7 +2711,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2673,7 +2719,7 @@ msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2681,7 +2727,7 @@ msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2689,7 +2735,7 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2697,34 +2743,34 @@ msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2732,7 +2778,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2740,493 +2786,493 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "firma la chiave irrevocabilmente"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente e irrevocabilmente"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "preferenze aggiornate"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3235,7 +3281,13 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3244,46 +3296,46 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3293,17 +3345,17 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
@@ -3311,72 +3363,72 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3386,7 +3438,7 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3396,56 +3448,56 @@ msgstr ""
 "firmata localmente con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
@@ -3454,13 +3506,13 @@ msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3490,34 +3542,34 @@ msgstr "Annotazione della firma: "
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Portachiavi"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della sottochiave:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della sottochiave:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Impronta digitale ="
 
@@ -3622,80 +3674,89 @@ msgstr "verifica della firma soppressa\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Non � disponibile un aiuto"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "versione sconosciuta"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -3738,12 +3799,17 @@ msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "questo messaggio pu� non essere utilizzabile da %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -3944,8 +4010,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "questo keyserver non � completamente compatibile con HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4047,36 +4113,41 @@ msgstr ""
 "chiave %08lX: non c'� una subchiave per il pacchetto di revoca della "
 "subchiave\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "ATTENZIONE: impossibile espandere i %% nell'URL (troppo lunga). Usata "
 "inespansa.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4085,22 +4156,22 @@ msgstr ""
 "lunga).\n"
 "Usata inespansa.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
@@ -4117,11 +4188,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
@@ -4324,7 +4395,7 @@ msgstr "trustdb: sync fallita: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
@@ -4337,22 +4408,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
@@ -4360,7 +4431,7 @@ msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "controllo al livello %d firmato=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -5142,33 +5213,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Va bene cos�? "
 
@@ -5212,3 +5283,6 @@ msgstr "errore cercando il record della fiducia: %s\n"
 #, c-format
 msgid "read error: %s\n"
 msgstr "errore di lettura: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "questo keyserver non � completamente compatibile con HKP\n"
diff --git a/po/ja.po b/po/ja.po
index a327977d6..6d3faaaa5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-04-23 09:37+0900\n"
+"Project-Id-Version: gnupg 1.2.1\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-07 22:57+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "quit"
 
@@ -214,7 +214,7 @@ msgstr "ͽ�����̥ǡ����Ǥ�"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "���դ�̷�⤷�Ƥ��ޤ�"
+msgstr "������̷�⤷�Ƥ��ޤ�"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
@@ -275,62 +275,62 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "��%s�פ˽񤱤ޤ���: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -358,6 +358,11 @@ msgstr ""
 #: cipher/md.c:140
 #, c-format
 msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "���󥢥르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
+
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 msgstr ""
 
 #: cipher/rndegd.c:204
@@ -366,8 +371,10 @@ msgid ""
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
+"�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
+"���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -375,165 +382,165 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[�ե����뷲]|�ե����뷲������"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "���ν�̾�򸡺�"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���˽�̾"
+msgstr "�����Ǥ��ʤ��褦���˽�̾"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
+msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
-msgstr "�˴������������"
+msgstr "���������������"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -543,237 +550,237 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ���ͤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "����μ���ͤ˴���θ������"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "v3��̾�������ʤ�"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "����Ū��v4��̾"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "v4��̾�������ʤ�"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "gpg����������Ȥ����"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "�����θ������븰�ؤ�ɽ��"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr ""
 "|�ե�����|���ơ����������ե������\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|��ID|���θ�������Ū�˿��Ѥ���"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ������Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "�ѥ��åȤȰŹ������Υ��ץ���\n"
 "�������PGP 2.x��������"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "�ե���ID��ɽ�����ʤ�"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "�ե���ID��������륳�ޥ�ɹ�\n"
 "������"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -782,7 +789,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -802,15 +809,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -820,7 +827,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -828,357 +835,390 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "�Ź�: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "�������С���URI�������ǽ\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ������\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "���������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "���������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "���������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "���������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
 #: g10/gpgv.c:68
-#, fuzzy
 msgid "take the keys from this keyring"
-msgstr "���θ����ؤ��������ޤ���? "
+msgstr "���θ����ؤ��������ޤ�"
 
 #: g10/gpgv.c:70
-#, fuzzy
 msgid "make timestamp conflicts only a warning"
-msgstr "���դ�̷�⤷�Ƥ��ޤ�"
+msgstr "������̷���ٹ�����ˤ��ޤ�"
 
 #: g10/gpgv.c:99
-#, fuzzy
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
+msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
 #: g10/gpgv.c:102
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
+"��ʸ: gpg [���ץ����] [�ե�����]\n"
+"���Ѥ������ǽ�̾�򸡺�\n"
 
 #: g10/armor.c:321
 #, c-format
@@ -1277,11 +1317,11 @@ msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
 #: g10/pkclist.c:75
 msgid "reason for revocation: "
-msgstr "�˴���ͳ: "
+msgstr "������ͳ: "
 
 #: g10/pkclist.c:92
 msgid "revocation comment: "
-msgstr "�˴���Ŭ��: "
+msgstr "������Ŭ��: "
 
 #. a string with valid answers
 #: g10/pkclist.c:254
@@ -1297,7 +1337,7 @@ msgstr ""
 "�����٤����ꤵ��Ƥ��ޤ���:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "       ��̾ \""
 
@@ -1354,7 +1394,7 @@ msgstr " s = ���θ��ϤȤФ�\n"
 msgid " q = quit\n"
 msgstr " q = ��λ\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
@@ -1369,7 +1409,7 @@ msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 #: g10/pkclist.c:436
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
+msgstr "��%08lX: ���ϼ����ѤߤǤ�!\n"
 
 #: g10/pkclist.c:443 g10/pkclist.c:455 g10/pkclist.c:555
 msgid "Use this key anyway? "
@@ -1378,7 +1418,7 @@ msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? "
 #: g10/pkclist.c:448
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "��%08lX: �������˴��ѤߤǤ�!\n"
+msgstr "��%08lX: �����ϼ����ѤߤǤ�!\n"
 
 #: g10/pkclist.c:469
 #, c-format
@@ -1431,7 +1471,7 @@ msgstr "�ٹ�: ���ѤǤ��ʤ������Ѥ��Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:605
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:606
 msgid "         This could mean that the signature is forgery.\n"
@@ -1439,7 +1479,7 @@ msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
 #: g10/pkclist.c:612
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "�ٹ�: �����������ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: �����������ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:617
 msgid "Note: This key has been disabled.\n"
@@ -1607,7 +1647,7 @@ msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
@@ -1626,7 +1666,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "����Ǥ���ޤ���? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -1833,27 +1873,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1861,16 +1901,16 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1882,7 +1922,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1893,53 +1933,53 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "��������`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1947,32 +1987,32 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
@@ -1991,17 +2031,17 @@ msgstr "�ѥ��ե졼���κ������顼: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 
@@ -2015,12 +2055,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
@@ -2030,332 +2070,332 @@ msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
+msgstr "�ٹ�: ��̩��%08lX�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "���θ������ˤ���������̩����%s�פ�����ޤ�!\n"
+msgstr "��������%08lX�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��%08lX: �������Τʤ���̩���Ǥ� - �����å�\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "         ��������: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " �����åפ�����������: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �ɹ���: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     �������桼����ID: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ����������: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           ��������̾: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "       �����������˴�: %lu\n"
+msgstr "       �����������: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "       ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             ̤�ɹ���: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr "����: ElGamal�μ縰�򸡽� - �����ˤ����ɹ��ߤ˻��֤�������ޤ�\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "��%08lX: HKP��������¤����\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "��%08lX: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν�Ф�\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "��%08lX: ��������%s�פ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "��%08lX: ��%s�׿������桼����ID��1��\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "��%08lX: ��%s�׿������桼����ID��%d��\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "��%08lX: ��%s�׿�������̾��1��\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "��%08lX: ��%s�׿�������̾��%d��\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "��%08lX: ��%s�׿�����������1��\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "��%08lX: ��%s�׿�����������%d��\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "��%08lX: ��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "��%08lX: ̵���ʰŹ�%d����̩���Ǥ� - �����å�\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
+msgstr "��%08lX: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "��%08lX: \"%s\" �˴���������ɤ߹��ߤޤ���\n"
+msgstr "��%08lX: ��%s�׼�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "��%08lX: �桼����id��%s�פΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "��%08lX: �桼����id��%s�פμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
@@ -2363,35 +2403,35 @@ msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "��%08lX: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
-msgstr "��%08lX: ���˴��ˤ�����������������ޤ���\n"
+msgstr "��%08lX: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
-msgstr "��%08lX: ̵���������˴��Ǥ�\n"
+msgstr "��%08lX: ̵�������������Ǥ�\n"
 
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "��%08lX: ̵�����������˴��������ޤ�\n"
+msgstr "��%08lX: ̵���������μ����������ޤ�\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
@@ -2400,59 +2440,59 @@ msgstr "��%08lX: �����åפ�������\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+msgstr "��%08lX: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - �����å�\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "��%08lX: ������̾�ξ�꤬�����äƤ��ޤ� - �����å�\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%08lX: ͽ�����̽�̾���饹 (0x%02X) - �����å�\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX�ΰ����Ф�\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "��%08lX: \"%s\" �˴���������ɲ�\n"
+msgstr "��%08lX: ��%s�׼�����������ɲ�\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
 
 #: g10/keyedit.c:149
 msgid "[revocation]"
-msgstr "[�˴�]"
+msgstr "[����]"
 
 #: g10/keyedit.c:150
 msgid "[self-signature]"
@@ -2497,22 +2537,29 @@ msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 #: g10/keyedit.c:362
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "�桼����ID��%s�פϡ��˴�����Ƥ��ޤ���"
+msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "�ٹ�: �桼����ID��%s�פϡ����ʽ�̾����Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2521,27 +2568,26 @@ msgstr ""
 "\"%s\" �ˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:424
-#, fuzzy, c-format
+#: g10/keyedit.c:460
+#, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
-"������̾�Ǥ���\n"
+"��%s�פˤ������뺣�Τ��ʤ��ν�̾��\n"
+"�����ڤ�Ǥ���\n"
 
-#: g10/keyedit.c:428
-#, fuzzy
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
+msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2550,54 +2596,53 @@ msgstr ""
 "\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
 "������̾�Ǥ���\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:483
-#, fuzzy
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
+msgstr "����Ǥ��̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "���θ��ϴ����ڤ�Ǥ�!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2606,37 +2651,37 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�פ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (����)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2644,7 +2689,7 @@ msgstr ""
 "\n"
 "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2652,15 +2697,15 @@ msgstr ""
 "\n"
 "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"�ٹ�: ��̾�ϡ��˴��ԲĤ����ꤵ��ޤ���\n"
+"�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2668,15 +2713,15 @@ msgstr ""
 "\n"
 "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+"��̾�ϼ����ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2684,7 +2729,7 @@ msgstr ""
 "\n"
 "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2692,7 +2737,7 @@ msgstr ""
 "\n"
 "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2700,34 +2745,34 @@ msgstr ""
 "\n"
 "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2735,7 +2780,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2744,493 +2789,491 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾"
+msgstr "�����Ǥ��ʤ��褦���ؽ�̾"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
+msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
-msgstr "�˴������ɲ�"
+msgstr "���������ɲ�"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "�������������"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "�����ΰ����򹹿�"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
-msgstr "��̾���˴�"
+msgstr "��̾�μ���"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
-msgstr "�桼����ID���˴�"
+msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
-msgstr "�������˴�"
+msgstr "�������"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
-msgstr "�����˴�����Ƥ��ޤ���"
+msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
-msgstr "���򤷤����桼����ID���������˴����ޤ���? "
+msgstr "���򤷤����桼����ID�������˼������ޤ���? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
-msgstr "���Υ桼����ID���������˴����ޤ���? "
+msgstr "���Υ桼����ID�������˼������ޤ���? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
-msgstr "���򤷤������������˴����ޤ���? "
+msgstr "���򤷤����������˼������ޤ���? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
-msgstr "���θ����������˴����ޤ���? "
+msgstr "���θ��������˼������ޤ���? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "�����������˹������ޤ���? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
-msgstr "���θ��ϡ�%s���ˤ�ä��˴����줿�褦�Ǥ� "
+msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (�ǥꥱ����)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �������˴��ѤߤǤ�: %s\n"
+msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
-msgstr "rev- �Ǥä��������˴���ȯ��\n"
+msgstr "rev- �Ǥä������μ�����ȯ��\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? �˴������㳲: %s\n"
+msgstr "rev? ���������㳲: %s\n"
 
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "revkey"
+msgstr "[����] "
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "expire"
+msgstr "[��λ] "
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3238,7 +3281,13 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3247,131 +3296,129 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�˴��Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
+"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "PGP 2.x�����θ��ˤϻ�̾�˴��Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
+msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
-msgstr "��̾�˴��ԤΥ桼����ID�����Ϥ��Ƥ�������: "
+msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "PGP 2.x�����θ��ϡ���̾�˴��Ԥ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "��̾�˴��Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "��̾�˴��Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "��̾�˴��Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3380,7 +3427,7 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3389,70 +3436,70 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "����Ǥ��˴��������Ǥ���? (y/N) "
+msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
+msgstr "   %08lX��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
-msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
+msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "�˴�������������˺��ޤ���? (y/N) "
+msgstr "����������������˺��ޤ���? (y/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "�桼����ID��%s�פϡ��⤦�˴�����Ƥ��ޤ�\n"
+msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
 
 #. Okay, this is a problem.  The user ID selfsig was
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3481,34 +3528,34 @@ msgstr "��̾����: "
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "                ���� ="
 
@@ -3594,7 +3641,7 @@ msgstr "���Υե�����̾='%.*s'\n"
 
 #: g10/mainproc.c:713
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
+msgstr "��Ω��������gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
 #: g10/mainproc.c:781
 msgid "Notation: "
@@ -3613,80 +3660,87 @@ msgstr "��̾�θ��ڤ��ά\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "�إ�פϤ���ޤ���"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "�����ڤ�ν�̾: \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
-msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
+msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
+msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ�\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s��̾����̾��: \"%s\"\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "primary"
+msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "̤�ΤΥС������Ǥ�"
+msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -3729,12 +3783,17 @@ msgstr "�ٹ�: ��%s�פϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�פ�����˻ȤäƤ�������\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -3907,7 +3966,7 @@ msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
 
 #: g10/pubkey-enc.c:249
 msgid "NOTE: key has been revoked"
-msgstr "����: �����˴��ѤߤǤ�"
+msgstr "����: ���ϼ����ѤߤǤ�"
 
 #: g10/hkp.c:71
 #, c-format
@@ -3935,8 +3994,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "���θ������С��ˤϡ�������HKP�ߴ���������ޤ���\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4024,54 +4083,56 @@ msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%08lX�ν�̾�������Ȥߤʤ��ޤ�\n"
 #: g10/sig-check.c:552
 #, c-format
 msgid "key %08lX: no subkey for subkey revocation packet\n"
-msgstr "��%08lX: ���˴��ѥ��åȤˤ�����������������ޤ���\n"
+msgstr "��%08lX: �������ѥ��åȤˤ�����������������ޤ���\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "��%08lX: �����б���������������ޤ���\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "PGP 2.x�����θ��ϡ���̾�˴��Ԥ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "PGP 2.x�����θ��ϡ���̾�˴��Ԥ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "PGP 2.x�����θ��ϡ���̾�˴��Ԥ�Ǥ̿�Ǥ��ޤ���\n"
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�������줿��̾�θ����˼���: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s��̾����̾��: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
@@ -4085,11 +4146,11 @@ msgstr "%s������Ǥ��ޤ���: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
@@ -4291,35 +4352,34 @@ msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "���ѥǡ����١����μ���θ����ϡ�%s�Ǥ�\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "������%08lX�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
+msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
@@ -4327,7 +4387,7 @@ msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "����%d�Ǹ�������̾�Ѥ�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -4504,7 +4564,7 @@ msgstr ""
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "�����˴����줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
+msgstr "���μ������줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
 
 #: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
@@ -4757,7 +4817,7 @@ msgid ""
 "self-signatures will be advanced by one second.\n"
 msgstr ""
 "���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
-"���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n"
+"���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
 #: g10/helptext.c:244
 msgid "Please enter the passhrase; this is a secret sentence \n"
@@ -4818,7 +4878,7 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"�⤷������������С��ʤ��˴��������ȯ�Ԥ���Τ������������\n"
+"�⤷������������С��ʤ������������ȯ�Ԥ���Τ������������\n"
 "�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
@@ -4892,169 +4952,168 @@ msgid ""
 "very large picture, your key will become very large as well!\n"
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
+"\n"
+"���ʤ��Υե���ID�˻Ȥ���������Ƥ���������������JPEG�ե�����Ǥ���ɬ\n"
+"�פ�����ޤ��������ϸ������Ȥ��ä���˳�Ǽ����롢�Ȥ������Ȥ�ǰƬ�ˤ�\n"
+"���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
+"�ޤ�! ���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
 #: g10/photoid.c:79
 msgid "Enter JPEG filename for photo ID: "
-msgstr ""
+msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
 #: g10/photoid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open photo \"%s\": %s\n"
-msgstr "exec-path��%s��������ǽ\n"
+msgstr "�̿����%s�פ򳫤����Ȥ��Ǥ��ޤ���: %s\n"
 
 #: g10/photoid.c:97
-#, fuzzy
 msgid "Are you sure you want to use it (y/N)? "
-msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
+msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
 
 #: g10/photoid.c:112
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" is not a JPEG file\n"
-msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
+msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
 #: g10/photoid.c:129
-#, fuzzy
 msgid "Is this photo correct (y/N/q)? "
-msgstr "����Ǥ����Ǥ��� (y/n)? "
+msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "exec-path��%s��������ǽ\n"
+msgstr "�ե���ID��ɽ����ǽ!\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr ""
+msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: g10/exec.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���: %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���: %s\n"
 
 #: g10/exec.c:325
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
+"���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
+"�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
 #: g10/exec.c:355
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
+"���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
 #. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute %s \"%s\": %s\n"
-msgstr "exec-path��%s��������ǽ\n"
+msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
 
 #: g10/exec.c:513
-#, fuzzy, c-format
+#, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
+msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
 
 #: g10/exec.c:524 g10/exec.c:583
 msgid "unnatural exit of external program\n"
-msgstr ""
+msgstr "�����ץ�����ब���Լ����˽�λ\n"
 
 #: g10/exec.c:539
-#, fuzzy
 msgid "unable to execute external program\n"
-msgstr "exec-path��%s��������ǽ\n"
+msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 
 #: g10/exec.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "exec-path��%s��������ǽ\n"
+msgstr "�����ץ������α������ɤ߹���ޤ���: %s\n"
 
 #: g10/exec.c:594 g10/exec.c:601
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr ""
+msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) `%s': %s\n"
 
 #: g10/exec.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
 #: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340
 msgid "never     "
-msgstr ""
+msgstr "̵����    "
 
 #: g10/revoke.c:92
 msgid "key incomplete\n"
-msgstr ""
+msgstr "�Դ����ʸ�\n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
 #: g10/revoke.c:186 g10/revoke.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "build_packet failed: %s\n"
-msgstr "�����˼��Ԥ��ޤ���: %s\n"
+msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 
 #: g10/revoke.c:145
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX incomplete\n"
-msgstr "��%08lX: �桼����ID������ޤ���\n"
+msgstr "��%08lX: �Դ���\n"
 
 #: g10/revoke.c:214 g10/revoke.c:433
-#, fuzzy
 msgid "sorry, can't do this in batch mode\n"
-msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
+msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/revoke.c:281
 msgid "To be revoked by:\n"
-msgstr ""
+msgstr "������:\n"
 
 #: g10/revoke.c:293
 msgid "(This is a sensitive revocation key)\n"
-msgstr ""
+msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
 #: g10/revoke.c:297 g10/revoke.c:503
-#, fuzzy
 msgid "Create a revocation certificate for this key? "
-msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
 
 #: g10/revoke.c:310 g10/revoke.c:534
 msgid "ASCII armored output forced.\n"
-msgstr ""
+msgstr "ASCII�������Ϥ������ޤ���\n"
 
 #: g10/revoke.c:324 g10/revoke.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "make_keysig_packet failed: %s\n"
-msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
+msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
 #. and issue a usage notice
 #: g10/revoke.c:387
-#, fuzzy
 msgid "Revocation certificate created.\n"
-msgstr "��%08lX: \"%s\" �˴���������ɲ�\n"
+msgstr "����������������\n"
 
 #: g10/revoke.c:393
 #, c-format
 msgid "no revocation keys found for `%s'\n"
-msgstr ""
+msgstr "��%s���Ѥμ������ϡ�����ޤ���\n"
 
 #: g10/revoke.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "secret key `%s' not found: %s\n"
-msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
+msgstr "��̩����%s�פ����Ĥ���ޤ���: %s\n"
 
 #: g10/revoke.c:485
-#, fuzzy, c-format
+#, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
+msgstr "�б����������������ޤ���: %s\n"
 
 #: g10/revoke.c:496
 msgid "public key does not match secret key!\n"
-msgstr ""
+msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
 #: g10/revoke.c:519
-#, fuzzy
 msgid "unknown protection algorithm\n"
-msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
+msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
 #: g10/revoke.c:523
-#, fuzzy
 msgid "NOTE: This key is not protected!\n"
-msgstr "���θ����ݸ��Ƥ��ޤ���\n"
+msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
 #. and issue a usage notice
 #: g10/revoke.c:574
@@ -5067,41 +5126,43 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
+"�����������������ޤ�����\n"
+"\n"
+"���Ĥ���ʤ��褦�����Τ˰�ư���Ƥ����������⤷��뤬���ξ�����ؤΥ�\n"
+"������������ȡ������Ĥ����ʤ��ξ������Ȥ��ʤ����뤳�Ȥ��Ǥ��ޤ���\n"
+"���Τ��ɽФ���ǽ�ˤʤä����������ơ����ξ��������������ݴɤ����\n"
+"�������Ǥ��������������դ��Ƥ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
+"����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:614
-#, fuzzy
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
-msgstr "�˴���ͳ: "
+msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
-msgstr ""
+msgstr "����󥻥�"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr ""
+msgstr "(�����ǤϤ��ä�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:667
-#, fuzzy
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr ""
-"\n"
-"�桼����ID�����ϡ����Ԥǽ�λ: "
+msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:695
-#, fuzzy, c-format
+#: g10/revoke.c:696
+#, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "�˴���ͳ: "
+msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
-msgstr ""
+msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:702
-#, fuzzy
+#: g10/revoke.c:703
 msgid "Is this okay? "
-msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? "
+msgstr "��������Ǥ���? "
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5109,38 +5170,46 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
+"# Sitei sareta sin'you no atai itiran %s\n"
+"# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
 
 #: g10/tdbdump.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "can't open file: %s\n"
-msgstr "%s�������ޤ���: %s\n"
+msgstr "�ե����뤬�����ޤ���: %s\n"
 
 #: g10/tdbdump.c:151
-#, fuzzy
 msgid "line too long\n"
-msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
+msgstr "�Ԥ�Ĺ�᤮�ޤ�\n"
 
 #: g10/tdbdump.c:159
 msgid "error: missing colon\n"
-msgstr ""
+msgstr "���顼: ������ȴ���Ƥ��ޤ�\n"
 
 #: g10/tdbdump.c:164
-#, fuzzy
 msgid "error: invalid fingerprint\n"
-msgstr "%s: ̵���ʥե����롦�С������%d\n"
+msgstr "���顼: ̵���ʻ���\n"
 
 #: g10/tdbdump.c:168
-#, fuzzy
 msgid "error: no ownertrust value\n"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
+msgstr "���顼: ��ͭ�Ԥ��Ѥ����ͤ�����ޤ���\n"
 
 #. error
 #: g10/tdbdump.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record: %s\n"
-msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
+msgstr "���ѥ쥳���ɤθ������顼: %s\n"
 
 #: g10/tdbdump.c:208
-#, fuzzy, c-format
+#, c-format
 msgid "read error: %s\n"
-msgstr "����: %s\n"
+msgstr "�ɹ��ߥ��顼: %s\n"
+
+#, fuzzy
+#~ msgid "The use of this algorithm is deprecated - create anyway? "
+#~ msgstr ""
+#~ "���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
+#~ "��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "���θ������С��ˤϡ�������HKP�ߴ���������ޤ���\n"
diff --git a/po/nl.po b/po/nl.po
index 3dc09d278..1c20747b8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+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"
@@ -48,7 +48,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "einde"
 
@@ -276,63 +276,63 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -363,6 +363,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -370,7 +375,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -378,170 +383,170 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -551,208 +556,208 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 #, 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -772,17 +777,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -792,7 +797,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -800,327 +805,361 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentaar: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ongeldige versleuteling"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ongeldige sleutelbos"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 #, 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:1940
+#: g10/g10.c:1915
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1979
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1984
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Sleutelgeneratie is mislukt: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "nummeren van de geheime sleutels mislukte: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Sleutelgeneratie is mislukt: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record mislukte: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "nummeren van de geheime sleutels mislukte: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1129,21 +1168,21 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
@@ -1292,7 +1331,7 @@ msgstr ""
 "Geen vertrouwenswaarde toegekend aan %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "              alias \""
 
@@ -1356,7 +1395,7 @@ msgstr ""
 msgid " q = quit\n"
 msgstr " q = be�indigen\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Uw keuze? "
 
@@ -1627,7 +1666,7 @@ msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
@@ -1643,7 +1682,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Deze sleutel toch gebruiken? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
@@ -1854,28 +1893,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 #, 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1883,17 +1922,17 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1905,7 +1944,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1918,54 +1957,54 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1974,12 +2013,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1987,7 +2026,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1995,15 +2034,15 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
@@ -2022,17 +2061,17 @@ msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
@@ -2046,12 +2085,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, fuzzy, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
@@ -2061,339 +2100,339 @@ msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s versleuteld voor: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets ge�xporteerd\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[gebruiker niet gevonden]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "ge�mporteerd: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels ge�mporteerd: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "ge�mporteerd: %lu"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, fuzzy, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, fuzzy, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel ge�mporteerd\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
@@ -2401,17 +2440,17 @@ msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
@@ -2419,17 +2458,17 @@ msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -2438,61 +2477,61 @@ msgstr "sleutel %08lX: subsleutel overgeslagen\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
@@ -2547,132 +2586,139 @@ msgstr ""
 msgid "User ID \"%s\" is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 #, fuzzy
 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:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr ""
 
 #: g10/keyedit.c:382
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "Sleutel is beveiligd.\n"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 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:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 #, fuzzy
 msgid " (default)"
 msgstr "(standaard is 1)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2680,7 +2726,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 #, fuzzy
 msgid ""
 "\n"
@@ -2688,7 +2734,7 @@ msgid ""
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 #, fuzzy
 msgid ""
 "\n"
@@ -2697,7 +2743,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 #, fuzzy
 msgid ""
 "\n"
@@ -2706,7 +2752,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 #, fuzzy
 msgid ""
 "\n"
@@ -2715,7 +2761,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 #, fuzzy
 msgid ""
 "\n"
@@ -2724,53 +2770,53 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2778,7 +2824,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2786,652 +2832,658 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "nrsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "nrlsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "add a photo ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "addrevoker"
 msgstr "revkey"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "add a revocation key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "set preference list"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updated preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "revsig"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "Really revoke all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr ""
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 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:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 #, 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:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geef de sleutelgrootte"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 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:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3440,7 +3492,7 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3449,59 +3501,59 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 #, 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:3052
+#: g10/keyedit.c:3126
 #, 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 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:3134
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Sleutel is beveiligd.\n"
@@ -3510,12 +3562,12 @@ msgstr "Sleutel is beveiligd.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3548,38 +3600,38 @@ msgstr "Aantekening: "
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "            Vingerafdruk:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "            Vingerafdruk:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "            Vingerafdruk:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "            Vingerafdruk:"
@@ -3688,81 +3740,90 @@ msgstr "controle van de ondertekening overgeslagen\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Geen hulp beschikbaar"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "onbekende versie"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -3804,12 +3865,17 @@ msgstr "LET OP: `%s' is een leeg bestand\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -4014,7 +4080,7 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
+msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
 #: g10/hkp.c:519
@@ -4113,49 +4179,54 @@ msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, fuzzy, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4169,11 +4240,11 @@ msgstr "kan %s niet aanmaken: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4379,7 +4450,7 @@ msgid "no need for a trustdb check\n"
 msgstr "%s: is geen vertrouwensdatabasebestand\n"
 
 # Untranslated.
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb rec %lu: lseed failed: %s\n"
@@ -4393,22 +4464,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "publieke sleutel niet gevonden"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4416,7 +4487,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5125,34 +5196,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "Deze sleutel toch gebruiken? "
@@ -5343,9 +5414,6 @@ msgstr "beveiliging: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "fout tijdens het lezen van primaire sleutel voor LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record mislukte: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "sleutel %08lX: opvragen van veld mislukte\n"
 
@@ -5358,9 +5426,6 @@ msgstr "beveiliging: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "nummeren van de geheime sleutels mislukte: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
 
diff --git a/po/pl.po b/po/pl.po
index a3736c3a7..7ab7d63d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-01-13 22:15+0100\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"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "wyj�cie"
 
@@ -282,65 +282,65 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� %s: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� %s: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� %s: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� %s: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -371,6 +371,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -378,7 +383,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -386,167 +391,167 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[pliki]|szyfrowanie plik�w"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "tylko zapis danych w formacie OpenPGP"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[pliki]|odszyfrowywanie plik�w"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr ""
 "z�o�enie na kluczu podpisu nie podlegaj�cego \n"
 "uniewa�nieniu"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 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:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie kluczy z serwera"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "automatyczne uaktualnienie bazy zaufania"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -556,195 +561,195 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "bez wymuszania trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "wymuszenie czwartej wersji formatu podpis�w"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "bez wymuszania czwartej wersji formatu podpis�w"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "do szyfrowania nie zostanie u�yty MDC"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "wykorzystanie gpg-agenta"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "okazanie, w kt�rym zbiorze kluczy znajduje si� dany klucz"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[plik]|zapisa� opis stanu do pliku"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|klucz ca�kowicie zaufany"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb obliczania has�a"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm skr�tu dla has�a ALG"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie numer�w kluczy adresat�w z zaszyfrowanych pakiet�w"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia u�ytkownika"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "bez pokazywania zdj��"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "polecenie wywo�ania przegl�darki do zdj��"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -752,7 +757,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -773,15 +778,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -791,7 +796,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -799,326 +804,360 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Komentarz: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,='\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s \"%s\".\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "tej wiadomo�ci mo�e nie da� si� odczyta� za pomoc� %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm tworzenia skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm tworzenia skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "%s nie jest dost�pne w trybie %s\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "OSTRZE�ENIE: podano adresat�w (-r) ale klucze publiczne nie s� u�ywane\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Generacja klucza nie powiod�a si�: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Generacja klucza nie powiod�a si�: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1126,19 +1165,19 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu certyfikacji jest niepoprawny\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
@@ -1283,7 +1322,7 @@ msgstr ""
 "Brak warto�ci zaufania dla:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                        alias \""
 
@@ -1340,7 +1379,7 @@ msgstr " p = pomini�cie klucza\n"
 msgid " q = quit\n"
 msgstr " w = wyj�cie\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
@@ -1596,7 +1635,7 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -1616,7 +1655,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Stworzy� klucz pomimo to? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -1824,49 +1863,49 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 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/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1878,7 +1917,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1892,53 +1931,53 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
 "entropii.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 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:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "klucz zosta� oznaczony jako obdarzony absolutnym zaufaniem.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1946,12 +1985,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1959,7 +1998,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1967,16 +2006,16 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Na pewno utworzy�? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
@@ -1996,17 +2035,17 @@ msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 "ustawiony tryb S2K nie pozwala u�y� pakietu ESK dla szyfru symetrycznego\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' ju� jest spakowany\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na szyfrowa� dla kluczy RSA kr�tszych od 2048 bit�w\n"
@@ -2022,12 +2061,12 @@ msgid ""
 msgstr ""
 "nie mo�na u�y� szyfru IDEA z wszystkimi kluczami dla kt�rych szyfrujesz.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
@@ -2037,339 +2076,339 @@ msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "klucz `%s' nie zosta� odaleziony: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Niepoprawny klucz %08lX uznany za poprawny przez --allow non-selfsigned-"
 "uid.\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "dla klucza publicznegi ,,%s'' jest klucz tajny!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "     nie do��czono do zbioru: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "UWAGA: Wykryto klucz g��wny algorytmu ElGamala. Jego import potrwa jaki� "
 "czas.\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "klucz %08lX: klucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa�nienia nie mo�e by� zastosowany\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "klucz %08lX: algorytm klucza publicznego \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
@@ -2377,17 +2416,17 @@ msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
@@ -2395,17 +2434,17 @@ msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -2414,58 +2453,58 @@ msgstr "klucz %08lX: podklucz pomini�ty\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: podpis na podkluczu w niew�a�ciwym miejscu - pomini�ty\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
@@ -2520,21 +2559,28 @@ msgstr ""
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 "OSTRZE�ENIE: identyfikator '%s' nie jest podpisany tym samym kluczem.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2543,11 +2589,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2556,7 +2602,7 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
@@ -2564,7 +2610,7 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2573,56 +2619,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "W trybie --pgp2 nie mo�na podpisywa� w formacie OpenPGP.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2631,31 +2677,31 @@ 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:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr "(domy�lnie)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2663,7 +2709,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2671,7 +2717,7 @@ msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2679,7 +2725,7 @@ msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2687,7 +2733,7 @@ msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2695,7 +2741,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nieeksportowalny (prywatny).\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2703,7 +2749,7 @@ msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2711,7 +2757,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2719,7 +2765,7 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2727,34 +2773,34 @@ msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Czy na pewno podpisa�? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2762,7 +2808,7 @@ msgstr ""
 "Wprowad� nowe d�ugie has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2770,499 +2816,499 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nupodpis"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "z�o�enie na kluczu podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nulpodpis"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "z�o�enie na kluczu lokalnego podpisu nie podlegaj�cego uniewa�nieniu"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "dodfoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "usfoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "dodun"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "g��wny"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "ustaw"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "aktopc"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "unpod"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "foto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "Really revoke all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (poufne)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  stworzony: %s, wygasa: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "unpkl"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "data"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3270,7 +3316,13 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3280,45 +3332,45 @@ msgstr ""
 "niekt�re \n"
 "             wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3328,85 +3380,85 @@ msgstr ""
 "kluczauniewa�niaj�cego, \n"
 "             spowoduje �e niekt�re wersje wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Do klucza dla wersji 2 PGP nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj indentyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3415,7 +3467,7 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3424,56 +3476,56 @@ msgstr ""
 "\"\n"
 "lokalnie podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "podpisany przez %08lX w %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony."
@@ -3482,12 +3534,12 @@ msgstr "Identyfikator u�ytkownika \"%s\" zosta� uniewa�niony."
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, fuzzy, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "OSTRZE�ENIE: konflikt skr�t�w podpis�w w wiadomo�ci\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
@@ -3516,34 +3568,34 @@ msgstr "Adnotacje podpisu: "
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
@@ -3650,81 +3702,90 @@ msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Pomoc niedost�pna"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "g��wny"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "nieznana wersja"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -3766,12 +3827,17 @@ msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\"\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "tej wiadomo�ci mo�e nie da� si� odczyta� za pomoc� %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 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:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -3971,8 +4037,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "serwer kluczy nie jest w pe�ni zgodny z HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4070,33 +4136,38 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL adnotacji (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4104,22 +4175,22 @@ msgstr ""
 "OSTRZE�ENIE: nie mo�na rozwin�� %% w URL regulaminu (jest zbyt d�ugi).\n"
 "             U�yty zostanie nie rozwini�ty.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2.x w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
@@ -4135,11 +4206,11 @@ msgstr "nie mo�na utworzy� %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
 
@@ -4342,7 +4413,7 @@ msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@ -4355,22 +4426,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
@@ -4378,7 +4449,7 @@ msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5139,37 +5210,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "pow�d uniewa�nienia: "
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "pow�d uniewa�nienia: "
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "U�y� tego klucza pomimo to? "
@@ -5216,6 +5287,9 @@ msgstr "b��d podczas odczytu wpisu katalogowego: %s\n"
 msgid "read error: %s\n"
 msgstr "b��d odczytu: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "serwer kluczy nie jest w pe�ni zgodny z HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "U�ywanie tego algorytmu jest odradzane - tworzy� mimo to? "
 
@@ -5396,9 +5470,6 @@ msgstr "b��d odczytu: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "b��d odczytu g��wnego klucza dla LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "klucz %08lX: wyszukanie zapisu nie powiod�o si�\n"
 
@@ -5411,9 +5482,6 @@ msgstr "b��d odczytu: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "klucz %08lX.%lu Dobre dowi�zanie podklucza\n"
 
diff --git a/po/pt.po b/po/pt.po
index ab1753e02..e0683f00a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "n�o"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "sair"
 
@@ -275,63 +275,63 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -361,6 +361,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -368,7 +373,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -376,163 +381,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|decifrar ficheiros"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave de forma n�o revoc�vel"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente e de forma n�o revoc�vel"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "actualizar automaticamente a base de dados de confian�a"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -542,213 +547,213 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "n�o for�ar assinaturas v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "n�o for�ar assinaturas v4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "nunca usar um MDC para cifrar"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 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:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escrever ifnroam��es de estado para o ficheiro"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 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:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "N�o mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -756,7 +761,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -776,15 +781,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -794,7 +799,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -802,319 +807,353 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, 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:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, 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:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
+
+#: g10/g10.c:2077
 #, 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:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "actualiza��o da chave secreta falhou: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1122,19 +1161,19 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 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:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
@@ -1276,7 +1315,7 @@ msgstr ""
 "Nenhum valor de confian�a designado para:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                   ou \""
 
@@ -1334,7 +1373,7 @@ msgstr " s = saltar esta chave\n"
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Decis�o? "
 
@@ -1590,7 +1629,7 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (assinatura e cifragem)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -1609,7 +1648,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1817,29 +1856,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1847,16 +1886,16 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1868,7 +1907,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1880,53 +1919,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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, 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:2244
+#: g10/keygen.c:2246
 #, 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:2258
+#: g10/keygen.c:2260
 #, 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:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1934,12 +1973,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1947,7 +1986,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1955,15 +1994,15 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
@@ -1982,17 +2021,17 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "n�o � poss�vel utilizar o pacote ESK sim�trico devido ao modo S2K\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "no modo --pgp2 s� pode cifrar com chaves RSA de 2048 bits ou menos\n"
 
@@ -2008,13 +2047,13 @@ msgstr ""
 "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
 "cifrar.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2026,337 +2065,337 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "NOTA: Chave prim�ria Elgamal detectada - pode demorar algum tempo a "
 "importar\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
@@ -2364,17 +2403,17 @@ msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
@@ -2382,17 +2421,17 @@ msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2401,56 +2440,56 @@ msgstr "chave %08lX: subchave ignorada\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@ -2504,20 +2543,27 @@ msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Utilizador \"%s\" est� revocado."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2526,11 +2572,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2539,14 +2585,14 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2555,55 +2601,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2613,31 +2659,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (por omiss�o)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2645,7 +2691,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2653,7 +2699,7 @@ msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2661,7 +2707,7 @@ msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2669,7 +2715,7 @@ msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2677,7 +2723,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2685,7 +2731,7 @@ msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2693,7 +2739,7 @@ msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2701,7 +2747,7 @@ msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2709,34 +2755,34 @@ msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 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:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2744,7 +2790,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2752,494 +2798,494 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 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:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma n�o-revog�vel"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma n�o revog�vel"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "prefer�ncias actualizadas"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, 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:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, 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:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 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:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��o falsa encontrada\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3247,7 +3293,13 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3256,46 +3308,46 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3304,84 +3356,84 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 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:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3390,7 +3442,7 @@ msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3399,56 +3451,56 @@ msgstr ""
 "\"\n"
 "assinada localmente com a sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
@@ -3457,13 +3509,13 @@ msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3493,34 +3545,34 @@ msgstr "Nota��o de assinatura: "
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Porta-chaves"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
@@ -3625,81 +3677,90 @@ msgstr "verifica��o de assinatura suprimida\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -3742,12 +3803,17 @@ msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "esta mensagem poder� n�o ser utiliz�vel pelo %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -3948,8 +4014,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "erro ao enviar para `%s': estado=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "o servidor de chaves n�o � totalmente compat�vel com HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4047,33 +4113,38 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "chave %08lX: sem subchave para o pacote revoca��o de subchave\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).  A "
 "utilizar n�o expandida.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4081,22 +4152,22 @@ msgstr ""
 "AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
 "A utilizar n�o expandida.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
@@ -4112,11 +4183,11 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
 
@@ -4321,7 +4392,7 @@ msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 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:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@ -4334,23 +4405,23 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4359,7 +4430,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5115,37 +5186,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "Usar esta chave de qualquer modo? "
@@ -5191,3 +5262,6 @@ msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 #, fuzzy, c-format
 msgid "read error: %s\n"
 msgstr "armadura: %s\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "o servidor de chaves n�o � totalmente compat�vel com HKP\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ed44e2276..de1348934 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -54,7 +54,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "sair"
 
@@ -285,63 +285,63 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -372,6 +372,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -379,7 +384,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -387,175 +392,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -565,169 +570,169 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 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:428
+#: g10/g10.c:425
 #, 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:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
@@ -735,59 +740,59 @@ msgstr ""
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 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:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -807,15 +812,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -825,7 +830,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -833,328 +838,362 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, 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:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr ""
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 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:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 #, 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:1940
+#: g10/g10.c:1915
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1979
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:1984
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+
+#: g10/g10.c:2077
 #, 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:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "enumera��o de chaves secretas falhou: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "A gera��o de chaves falhou: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "get_dir_record: search_record falhou: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "enumera��o de chaves secretas falhou: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, 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:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1163,21 +1202,21 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1327,7 +1366,7 @@ msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                   ou \""
 
@@ -1392,7 +1431,7 @@ msgstr ""
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
@@ -1656,7 +1695,7 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -1672,7 +1711,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1882,28 +1921,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 #, 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1911,17 +1950,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1933,7 +1972,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1945,54 +1984,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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, 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:2244
+#: g10/keygen.c:2246
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -2000,12 +2039,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -2013,7 +2052,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -2021,15 +2060,15 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
@@ -2048,17 +2087,17 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr ""
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, fuzzy, c-format
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 
@@ -2072,12 +2111,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, fuzzy, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
@@ -2087,335 +2126,335 @@ msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, fuzzy, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, fuzzy, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, fuzzy, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, fuzzy, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
@@ -2423,17 +2462,17 @@ msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
@@ -2441,17 +2480,17 @@ msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -2460,52 +2499,52 @@ msgstr "chave %08lX: subchave ignorada\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
@@ -2559,132 +2598,139 @@ msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr ""
 
 #: g10/keyedit.c:382
 #, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgid "User ID \"%s\" is expired."
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 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:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 #, fuzzy
 msgid " (default)"
 msgstr "(o padr�o � 1)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2692,14 +2738,14 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 #, fuzzy
 msgid ""
 "\n"
 "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 #, fuzzy
 msgid ""
 "\n"
@@ -2708,7 +2754,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 #, fuzzy
 msgid ""
 "\n"
@@ -2717,7 +2763,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 #, fuzzy
 msgid ""
 "\n"
@@ -2726,7 +2772,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 #, fuzzy
 msgid ""
 "\n"
@@ -2735,53 +2781,53 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2789,7 +2835,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2797,653 +2843,659 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "addrevoker"
 msgstr "revkey"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 #, fuzzy
 msgid "set preference list"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "revsig"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 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:1243
+#: g10/keyedit.c:1279
 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:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "Really revoke all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr ""
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 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:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 #, 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:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3452,7 +3504,7 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, fuzzy, c-format
 msgid ""
 "\"\n"
@@ -3461,59 +3513,59 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 #, 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:3052
+#: g10/keyedit.c:3126
 #, 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
@@ -3522,12 +3574,12 @@ msgstr "A chave � protegida.\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3560,38 +3612,38 @@ msgstr "Nota��o: "
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "       Impress�o digital:"
@@ -3700,81 +3752,90 @@ msgstr "verifica��o de assinatura suprimida\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Nenhuma ajuda dispon�vel"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 #, fuzzy
 msgid "Expired signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -3818,12 +3879,17 @@ msgstr "AVISO: `%s' � um arquivo vazio\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr ""
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -4028,7 +4094,7 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
+msgid "this keyserver does not support --search-keys\n"
 msgstr ""
 
 #: g10/hkp.c:519
@@ -4125,49 +4191,54 @@ msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr ""
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, fuzzy, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4181,11 +4252,11 @@ msgstr "imposs�vel criar %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4390,7 +4461,7 @@ msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
@@ -4404,22 +4475,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, fuzzy, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4427,7 +4498,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5129,34 +5200,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "Usa esta chave de qualquer modo? "
@@ -5345,9 +5416,6 @@ msgstr "erro de leitura: %s\n"
 #~ msgid "error reading primary key for LID %lu: %s\n"
 #~ msgstr "erro lendo chave prim�ria para LID %lu: %s\n"
 
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record falhou: %s\n"
-
 #~ msgid "key %08lX: query record failed\n"
 #~ msgstr "chave %08lX: pedido de registro falhou\n"
 
@@ -5360,9 +5428,6 @@ msgstr "erro de leitura: %s\n"
 #~ msgid "key %08lX: secret and public key don't match\n"
 #~ msgstr "chave %08lX: chaves secreta e p�blica n�o s�o correspondentes\n"
 
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "enumera��o de chaves secretas falhou: %s\n"
-
 #~ msgid "key %08lX.%lu: Good subkey binding\n"
 #~ msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 000000000..53595361b
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,5034 @@
+# Mesajele �n limba rom�n� pentru gnupg.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Acest fi�ier este distribuit sub aceea�i licen�� ca �i pachetul gnupg.
+# Laurentiu Buzdugan <[email protected]>, 2003.
+#
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnupg 1.2.2\n"
+"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"PO-Revision-Date: 2003-05-11 12:00-0500\n"
+"Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
+"Language-Team: Romanian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: util/secmem.c:88
+msgid "WARNING: using insecure memory!\n"
+msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
+
+#: util/secmem.c:89
+msgid "please see http://www.gnupg.org/faq.html for more information\n"
+msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
+
+#: util/secmem.c:326
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
+
+#: util/secmem.c:327
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
+
+#: util/miscutil.c:296 util/miscutil.c:331
+msgid "yes"
+msgstr "da"
+
+#: util/miscutil.c:297 util/miscutil.c:334
+msgid "yY"
+msgstr "dD"
+
+#: util/miscutil.c:298 util/miscutil.c:332
+msgid "no"
+msgstr "nu"
+
+#: util/miscutil.c:299 util/miscutil.c:335
+msgid "nN"
+msgstr "nN"
+
+#: util/miscutil.c:333 g10/keyedit.c:941
+msgid "quit"
+msgstr "termin�"
+
+#: util/miscutil.c:336
+msgid "qQ"
+msgstr "tT"
+
+#: util/errors.c:54
+msgid "general error"
+msgstr "eroare general�"
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr "tip de pachet necunoscut"
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr "versiune necunoscut�"
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr "algoritm pubkey necunoscut"
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr "algoritm rezumat necunoscut"
+
+#: util/errors.c:59
+msgid "bad public key"
+msgstr "cheie public� incorect�"
+
+#: util/errors.c:60
+msgid "bad secret key"
+msgstr "cheie secret� incorect�"
+
+#: util/errors.c:61
+msgid "bad signature"
+msgstr "semn�tur� incorect�"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr "eroare checksum"
+
+#: util/errors.c:63
+msgid "bad passphrase"
+msgstr "fraz�-parol� incorect�"
+
+#: util/errors.c:64
+msgid "public key not found"
+msgstr "cheia public� nu a fost g�sit�"
+
+#: util/errors.c:65
+msgid "unknown cipher algorithm"
+msgstr "algoritm cifrare necunoscut"
+
+#: util/errors.c:66
+msgid "can't open the keyring"
+msgstr "nu pot deschide inelul de chei"
+
+#: util/errors.c:67
+msgid "invalid packet"
+msgstr "pachet invalid"
+
+#: util/errors.c:68
+msgid "invalid armor"
+msgstr "armur� invalid�"
+
+#: util/errors.c:69
+msgid "no such user id"
+msgstr "nu exist� acest id utilizator"
+
+#: util/errors.c:70
+msgid "secret key not available"
+msgstr "cheia secret� nu e disponibil�"
+
+#: util/errors.c:71
+msgid "wrong secret key used"
+msgstr "a fost folosit� o cheie secret� gre�it�"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr "nu este suportat(�)"
+
+#: util/errors.c:73
+msgid "bad key"
+msgstr "cheie incorect�"
+
+#: util/errors.c:74
+msgid "file read error"
+msgstr "eroare citire fi�ier"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr "eroare scriere fi�ier"
+
+#: util/errors.c:76
+msgid "unknown compress algorithm"
+msgstr "algoritm compresie necunoscut"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr "eroare deschidere fi�ier"
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr "eroare creare fi�ier"
+
+#: util/errors.c:79
+msgid "invalid passphrase"
+msgstr "fraz�-parol� invalid�"
+
+#: util/errors.c:80
+msgid "unimplemented pubkey algorithm"
+msgstr "algoritm pubkey neimplementat"
+
+#: util/errors.c:81
+msgid "unimplemented cipher algorithm"
+msgstr "algoritm cifrare neimplementat"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr "clas� semn�turi necunoscut�"
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr "eroare baz� de date �ncredere"
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr "MPI incorect"
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr "limit� resurse"
+
+#: util/errors.c:86
+msgid "invalid keyring"
+msgstr "inel de chei invalid"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr "certificat incorect"
+
+#: util/errors.c:88
+msgid "malformed user id"
+msgstr "id utilizator anormal"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr "eroare �nchidere fi�ier"
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr "eroare redenumire fi�ier"
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr "eroare �tergere fi�ier"
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr "date nea�teptate"
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr "conflict timestamp"
+
+#: util/errors.c:94
+msgid "unusable pubkey algorithm"
+msgstr "algoritm pubkey nefolosibil"
+
+#: util/errors.c:95
+msgid "file exists"
+msgstr "fi�ierul exist�"
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr "cheie slab�"
+
+#: util/errors.c:97
+msgid "invalid argument"
+msgstr "argument invalid"
+
+#: util/errors.c:98
+msgid "bad URI"
+msgstr "URI incorect"
+
+#: util/errors.c:99
+msgid "unsupported URI"
+msgstr "URI nesuportat"
+
+#: util/errors.c:100
+msgid "network error"
+msgstr "eroare re�ea"
+
+#: util/errors.c:102
+msgid "not encrypted"
+msgstr "necifrat"
+
+#: util/errors.c:103
+msgid "not processed"
+msgstr "neprocesat"
+
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+msgid "unusable public key"
+msgstr "cheie public� de nefolosit"
+
+#: util/errors.c:106
+msgid "unusable secret key"
+msgstr "cheie secret� de nefolosit"
+
+#: util/errors.c:107
+msgid "keyserver error"
+msgstr "eroare server de chei"
+
+#: util/logger.c:249
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... acesta este un bug (%s:%d:%s)\n"
+
+#: util/logger.c:255
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "a�i g�sit un bug ... (%s:%d)\n"
+
+#: cipher/random.c:157
+msgid "no entropy gathering module detected\n"
+msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
+
+#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "nu pot deschide `%s': %s\n"
+
+#: cipher/random.c:385
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "nu pot ob�ine statistici `%s': %s\n"
+
+#: cipher/random.c:390
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "`%s' nu este un fi�ier normal - ignorat\n"
+
+#: cipher/random.c:395
+msgid "note: random_seed file is empty\n"
+msgstr "not�: fi�ier random_seed este gol\n"
+
+#: cipher/random.c:401
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi folosit�\n"
+
+#: cipher/random.c:409
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "nu pot citi `%s': %s\n"
+
+#: cipher/random.c:447
+msgid "note: random_seed file not updated\n"
+msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
+
+#: cipher/random.c:467 g10/exec.c:481
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "nu pot crea `%s': %s\n"
+
+#: cipher/random.c:474
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "nu pot scrie `%s': %s\n"
+
+#: cipher/random.c:477
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "nu pot �nchide `%s': %s\n"
+
+#: cipher/random.c:723
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "AVERISMENT: este folosit un generator de numere aleatoare nesigur (insecure)!!\n"
+
+#: cipher/random.c:724
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"Generatorul de numere aleatoare este doar ceva temporar pentru\n"
+"a-l face s� mearg� - nu este nicidecum un GNA sigur (secure)!\n"
+"\n"
+"NU FOLOSI�I NICI O DAT� GENERAT� DE ACEST PROGRAM!!\n"
+"\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available.  Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Nu sunt disponibili destui octe�i aleatori.  V� rug�m face�i ceva pentru\n"
+"a da sistemului de operare o �ans� de a colecta mai mult� entropie\n"
+"(Mai sunt necesari %d octe�i)\n"
+
+#: cipher/md.c:140
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"V� rug�m a�tepta�i, este adunat� entropia. Face�i ceva dac� v� ajut� s�\n"
+"nu v� plictisi�i, pentru c� va �mbun�t��i calitatea entropiei.\n"
+
+#: g10/g10.c:307
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Comenzi:\n"
+" "
+
+#: g10/g10.c:309
+msgid "|[file]|make a signature"
+msgstr "|[fi�ier]|creaz� o semn�tur�"
+
+#: g10/g10.c:310
+msgid "|[file]|make a clear text signature"
+msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
+
+#: g10/g10.c:311
+msgid "make a detached signature"
+msgstr "creaz� o semn�tur� deta�at�"
+
+#: g10/g10.c:312
+msgid "encrypt data"
+msgstr "cifreaz� datele"
+
+#: g10/g10.c:313
+msgid "|[files]|encrypt files"
+msgstr "|[fi�iere]|cifreaz� fi�iere"
+
+#: g10/g10.c:314
+msgid "encryption only with symmetric cipher"
+msgstr "cifreaz� numai cu cifru simetric"
+
+#: g10/g10.c:315
+msgid "store only"
+msgstr "doar p�streaz�"
+
+#: g10/g10.c:316
+msgid "decrypt data (default)"
+msgstr "decripteaz� datele (implicit)"
+
+#: g10/g10.c:317
+msgid "|[files]|decrypt files"
+msgstr "|[fi�iere]|decripteaz� fi�iere"
+
+#: g10/g10.c:318
+msgid "verify a signature"
+msgstr "verific� o semn�tur�"
+
+#: g10/g10.c:320
+msgid "list keys"
+msgstr "enumer� chei"
+
+#: g10/g10.c:322
+msgid "list keys and signatures"
+msgstr "enumer� chei �i semn�turi"
+
+#: g10/g10.c:323
+msgid "check key signatures"
+msgstr "verific� semn�turile cheii"
+
+#: g10/g10.c:324
+msgid "list keys and fingerprints"
+msgstr "enumer� chei �i amprente"
+
+#: g10/g10.c:325
+msgid "list secret keys"
+msgstr "enumer� chei secrete"
+
+#: g10/g10.c:326
+msgid "generate a new key pair"
+msgstr "genereaz� o nou� perechi de chei"
+
+#: g10/g10.c:327
+msgid "remove keys from the public keyring"
+msgstr "�terge chei de pe inelul de chei public"
+
+#: g10/g10.c:329
+msgid "remove keys from the secret keyring"
+msgstr "�terge chei de pe inelul de chei secret"
+
+#: g10/g10.c:330
+msgid "sign a key"
+msgstr "semneaz� o cheie"
+
+#: g10/g10.c:331
+msgid "sign a key locally"
+msgstr "semneaz� o cheie local"
+
+#: g10/g10.c:332
+msgid "sign a key non-revocably"
+msgstr "semneaz� o cheie irevocabil"
+
+#: g10/g10.c:333
+msgid "sign a key locally and non-revocably"
+msgstr "semneaz� o cheie local �i irevocabil"
+
+#: g10/g10.c:334
+msgid "sign or edit a key"
+msgstr "semneaz� sau editeaz� o cheie"
+
+#: g10/g10.c:335
+msgid "generate a revocation certificate"
+msgstr "genereaz� un certificat de revocare"
+
+#: g10/g10.c:337
+msgid "export keys"
+msgstr "export� chei"
+
+#: g10/g10.c:338
+msgid "export keys to a key server"
+msgstr "export� chei pentru un server de chei"
+
+#: g10/g10.c:339
+msgid "import keys from a key server"
+msgstr "import� chei de la un server de chei"
+
+#: g10/g10.c:341
+msgid "search for keys on a key server"
+msgstr "caut� pentru chei pe un server de chei"
+
+#: g10/g10.c:343
+msgid "update all keys from a keyserver"
+msgstr "actualizeaz� toate cheile de la un server de chei"
+
+#: g10/g10.c:347
+msgid "import/merge keys"
+msgstr "import�/combin� chei"
+
+#: g10/g10.c:349
+msgid "list only the sequence of packets"
+msgstr "enumer� numai secven�a de pachete"
+
+#: g10/g10.c:351
+msgid "export the ownertrust values"
+msgstr "export� valorile �ncrederii �n proprietari"
+
+#: g10/g10.c:353
+msgid "import ownertrust values"
+msgstr "import� valorile �ncrederii �n proprietari"
+
+#: g10/g10.c:355
+msgid "update the trust database"
+msgstr "actualizeaz� baza de date de �ncredere"
+
+#: g10/g10.c:357
+msgid "unattended trust database update"
+msgstr "actualizare f�r� supraveghere a bazei de date de �ncredere"
+
+#: g10/g10.c:358
+msgid "fix a corrupted trust database"
+msgstr "repar� o baz� de date de �ncredere corupt�"
+
+#: g10/g10.c:359
+msgid "De-Armor a file or stdin"
+msgstr "Elimin� armura unui fi�ier sau intr�rii standard (stdin)"
+
+#: g10/g10.c:361
+msgid "En-Armor a file or stdin"
+msgstr "Pune armura unui fi�ier sau intr�rii standard (stdin)"
+
+#: g10/g10.c:363
+msgid "|algo [files]|print message digests"
+msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
+
+#: g10/g10.c:367 g10/gpgv.c:64
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Op�iuni:\n"
+" "
+
+#: g10/g10.c:369
+msgid "create ascii armored output"
+msgstr "creaz� ie�ire �n armur� ascii"
+
+#: g10/g10.c:371
+msgid "|NAME|encrypt for NAME"
+msgstr "|NUME|cifrare pentru NUME"
+
+#: g10/g10.c:374
+msgid "|NAME|use NAME as default recipient"
+msgstr "|NUME|folose�te NUME ca destinatar implicit"
+
+#: g10/g10.c:376
+msgid "use the default key as default recipient"
+msgstr "folose�te cheia implicit� ca destinatar implicit"
+
+#: g10/g10.c:382
+msgid "use this user-id to sign or decrypt"
+msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
+
+#: g10/g10.c:383
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
+
+#: g10/g10.c:385
+msgid "use canonical text mode"
+msgstr "folose�te modul text canonic"
+
+#: g10/g10.c:393
+msgid "use as output file"
+msgstr "folose�te ca fi�ier ie�ire"
+
+#: g10/g10.c:394 g10/gpgv.c:66
+msgid "verbose"
+msgstr "locvace"
+
+#: g10/g10.c:395 g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "fii oarecum mai t�cut"
+
+#: g10/g10.c:396
+msgid "don't use the terminal at all"
+msgstr "nu folosi deloc terminalul"
+
+#: g10/g10.c:397
+msgid "force v3 signatures"
+msgstr "for�eaz� semn�turi v3"
+
+#: g10/g10.c:398
+msgid "do not force v3 signatures"
+msgstr "nu for�a semn�turi v3"
+
+#: g10/g10.c:399
+msgid "force v4 key signatures"
+msgstr "for�eaz� semn�turi de chei v4"
+
+#: g10/g10.c:400
+msgid "do not force v4 key signatures"
+msgstr "nu for�a semn�turi de chei v4"
+
+#: g10/g10.c:401
+msgid "always use a MDC for encryption"
+msgstr "folose�te �ntotdeauna un MDC pentru cifrare"
+
+#: g10/g10.c:403
+msgid "never use a MDC for encryption"
+msgstr "nu folosi niciodat� un MDC pentru cifrare"
+
+#: g10/g10.c:405
+msgid "do not make any changes"
+msgstr "nu face nici o schimbare"
+
+#: g10/g10.c:406
+msgid "prompt before overwriting"
+msgstr "�ntreab� �nainte de a suprascrie"
+
+#: g10/g10.c:407
+msgid "use the gpg-agent"
+msgstr "folose�te gpg-agent"
+
+#: g10/g10.c:410
+msgid "batch mode: never ask"
+msgstr "modul batch: nu �ntreba niciodat�"
+
+#: g10/g10.c:411
+msgid "assume yes on most questions"
+msgstr "presupune da la cele mai multe �ntreb�ri"
+
+#: g10/g10.c:412
+msgid "assume no on most questions"
+msgstr "presupune nu la cele mai multe �ntreb�ri"
+
+#: g10/g10.c:413
+msgid "add this keyring to the list of keyrings"
+msgstr "adaug� acest inel de chei la lista inelelor de chei"
+
+#: g10/g10.c:414
+msgid "add this secret keyring to the list"
+msgstr "adaug� acest inel de chei secret la list�"
+
+#: g10/g10.c:415
+msgid "show which keyring a listed key is on"
+msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
+
+#: g10/g10.c:416
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
+
+#: g10/g10.c:417
+msgid "|HOST|use this keyserver to lookup keys"
+msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
+
+#: g10/g10.c:421
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NUME|seteaz� charset-ul pentru terminal ca NUME"
+
+#: g10/g10.c:422
+msgid "read options from file"
+msgstr "cite�te op�iuni din fi�ier"
+
+#: g10/g10.c:426 g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr "|FD|scrie informa�ii de stare �n acest FD"
+
+#: g10/g10.c:428
+msgid "|[file]|write status info to file"
+msgstr "|[fi�ier]|scrie informa�ii de stare �n fi�ier"
+
+#: g10/g10.c:440
+msgid "|KEYID|ultimately trust this key"
+msgstr "|IDCHEIE|ai �ncredere deplin� �n aceast� cheie"
+
+#: g10/g10.c:441
+msgid "|FILE|load extension module FILE"
+msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
+
+#: g10/g10.c:442
+msgid "emulate the mode described in RFC1991"
+msgstr "emuleaz� modul descris �n RFC1991"
+
+#: g10/g10.c:443
+msgid "set all packet, cipher and digest options to OpenPGP behavior"
+msgstr "seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru comportamentul OpenPGP"
+
+#: g10/g10.c:444
+msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+msgstr "seteaz� toate op�iunile pentru pachete, cifru �i rezumat ca pentru comportamentul PGP 2.x"
+
+#: g10/g10.c:452
+msgid "|N|use passphrase mode N"
+msgstr "|N|folose�te modul fraz�-parol� N"
+
+#: g10/g10.c:454
+msgid "|NAME|use message digest algorithm NAME for passphrases"
+msgstr "|NUME|folose�te algoritm rezumat mesaj NUME pentru fraza-parol�"
+
+#: g10/g10.c:456
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|NUME|folose�te algoritm cifrare NUME pentru fraza-parol�"
+
+#: g10/g10.c:458
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NUME|folose�te algoritm cifrare NUME"
+
+#: g10/g10.c:459
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
+
+#: g10/g10.c:461
+msgid "|N|use compress algorithm N"
+msgstr "|N|folose�te algoritm compresie N"
+
+#: g10/g10.c:462
+msgid "throw keyid field of encrypted packets"
+msgstr "ignor� c�mp keyid pentru pachete cifrate"
+
+#: g10/g10.c:463
+msgid "Show Photo IDs"
+msgstr "Arat� poze ID-uri"
+
+#: g10/g10.c:464
+msgid "Don't show Photo IDs"
+msgstr "Nu ar�ta poze ID-uri"
+
+#: g10/g10.c:465
+msgid "Set command line to view Photo IDs"
+msgstr "Seteaz� linia de comand� pentru a vedea poze ID-uri"
+
+#: g10/g10.c:471
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+"@\n"
+"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
+
+#: g10/g10.c:474
+msgid ""
+"@\n"
+"Examples:\n"
+"\n"
+" -se -r Bob [file]          sign and encrypt for user Bob\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
+msgstr ""
+"@\n"
+"Exemple:\n"
+"\n"
+" -se -r Dan [fi�ier]        semneaz� �i cifreaz� pentru utilizatorul Dan\n"
+" --clearsign [fi�ier]       creaz� o semn�tur� text �n clar\n"
+" --detach-sign [fi�ier]     creaz� o semn�tur� deta�at�\n"
+" --list-keys [nume]         arat� chei\n"
+" --fingerprint [nume]       arat� amprente\n"
+
+#: g10/g10.c:634 g10/gpgv.c:95
+msgid "Please report bugs to <[email protected]>.\n"
+msgstr "Raporta�i bug-uri la <[email protected]>.\n"
+
+#: g10/g10.c:638
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: g10/g10.c:641
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"sign, check, encrypt or decrypt\n"
+"default operation depends on the input data\n"
+msgstr ""
+"Sintax�: gpg [op�iuni] [fi�iere]\n"
+"sign, check, encrypt sau decrypt\n"
+"opera�iunea implicit� depinde de datele de intrare\n"
+
+#: g10/g10.c:652
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Algoritmuri suportate:\n"
+
+#: g10/g10.c:655
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
+#: g10/g10.c:661 g10/keyedit.c:1531
+msgid "Cipher: "
+msgstr "Cifru: "
+
+#: g10/g10.c:667
+msgid "Hash: "
+msgstr "Hash: "
+
+#: g10/g10.c:673 g10/keyedit.c:1577
+msgid "Compression: "
+msgstr "Compresie: "
+
+#: g10/g10.c:756
+msgid "usage: gpg [options] "
+msgstr "folosire: gpg [op�iuni] "
+
+#: g10/g10.c:824
+msgid "conflicting commands\n"
+msgstr "comenzi �n conflict\n"
+
+#: g10/g10.c:842
+#, c-format
+msgid "no = sign found in group definition \"%s\"\n"
+msgstr "nu am g�sit nici un semn = �n defini�ia grupului \"%s\"\n"
+
+#: g10/g10.c:1010
+#, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
+msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1013
+#, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1016
+#, c-format
+msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
+msgstr "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1020
+#, c-format
+msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
+msgstr "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s\"\n"
+
+#: g10/g10.c:1196
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
+
+#: g10/g10.c:1232
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
+
+#: g10/g10.c:1236
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "fi�ier op�iuni `%s': %s\n"
+
+#: g10/g10.c:1243
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "citesc op�iuni din `%s'\n"
+
+#: g10/g10.c:1429
+#, c-format
+msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
+msgstr "extensie cifru \"%s\" nu a fost �nc�rcat din cauza permisiunilor nesigure (unsafe)\n"
+
+#: g10/g10.c:1569
+#, c-format
+msgid "%s is not a valid character set\n"
+msgstr "%s nu este un set de carectere valid\n"
+
+#: g10/g10.c:1587
+msgid "could not parse keyserver URI\n"
+msgstr "nu am putut interpreta URI pentru serverul de chei\n"
+
+#: g10/g10.c:1596
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: op�iuni import invalide\n"
+
+#: g10/g10.c:1599
+msgid "invalid import options\n"
+msgstr "op�iuni import invalide\n"
+
+#: g10/g10.c:1606
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: op�iuni export invalide\n"
+
+#: g10/g10.c:1609
+msgid "invalid export options\n"
+msgstr "op�iuni export invalide\n"
+
+#: g10/g10.c:1615
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "nu pot seta cale-execu�ie ca %s\n"
+
+#: g10/g10.c:1742
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
+
+#: g10/g10.c:1746
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
+
+#: g10/g10.c:1753 g10/g10.c:1764
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
+
+#: g10/g10.c:1755 g10/g10.c:1774
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s nu este permis cu %s!\n"
+
+#: g10/g10.c:1758
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s nu are sens cu %s!\n"
+
+#: g10/g10.c:1784
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul --pgp2\n"
+
+#: g10/g10.c:1790
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
+
+#: g10/g10.c:1796
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 activat.\n"
+
+#: g10/g10.c:1809
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
+
+#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
+#: g10/sign.c:650 g10/sign.c:897
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "acest mesaj s-ar putea s� nu poat� fi folosit de %s\n"
+
+#: g10/g10.c:1890 g10/g10.c:1908
+msgid "selected cipher algorithm is invalid\n"
+msgstr "algoritm cifrare selectat este invalid\n"
+
+#: g10/g10.c:1896 g10/g10.c:1914
+msgid "selected digest algorithm is invalid\n"
+msgstr "algoritm rezumat selectat este invalid\n"
+
+#: g10/g10.c:1902
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "algoritm rezumat certificare selectat este invalid\n"
+
+#: g10/g10.c:1917
+#, c-format
+msgid "compress algorithm must be in range %d..%d\n"
+msgstr "algoritm compresie trebuie s� fie �n intervalul %d..%d\n"
+
+#: g10/g10.c:1919
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
+
+#: g10/g10.c:1921
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
+
+#: g10/g10.c:1923
+msgid "max-cert-depth must be in range 1 to 255\n"
+msgstr "max-cert-depth trebuie s� fie �n intervalul 1..255\n"
+
+#: g10/g10.c:1926
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
+
+#: g10/g10.c:1930
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
+
+#: g10/g10.c:1934
+msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
+msgstr "default-check-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
+
+#: g10/g10.c:1940
+msgid "invalid default preferences\n"
+msgstr "preferin�e implicite invalide\n"
+
+#: g10/g10.c:1948
+msgid "invalid personal cipher preferences\n"
+msgstr "preferin�e cifrare personale invalide\n"
+
+#: g10/g10.c:1952
+msgid "invalid personal digest preferences\n"
+msgstr "preferin�e rezumat personale invalide\n"
+
+#: g10/g10.c:1956
+msgid "invalid personal compress preferences\n"
+msgstr "preferin�e compresie personale invalide\n"
+
+#: g10/g10.c:2042
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
+
+#: g10/g10.c:2052
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie public�\n"
+
+#: g10/g10.c:2062
+msgid "--store [filename]"
+msgstr "--store [nume_fi�ier]"
+
+#: g10/g10.c:2069
+msgid "--symmetric [filename]"
+msgstr "--symmetric [nume_fi�ier]"
+
+#: g10/g10.c:2077
+msgid "--encrypt [filename]"
+msgstr "--encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2094
+msgid "--sign [filename]"
+msgstr "--sign [nume_fi�ier]"
+
+#: g10/g10.c:2107
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [nume_fi�ier]"
+
+#: g10/g10.c:2121
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [nume_fi�ier]"
+
+#: g10/g10.c:2130
+msgid "--clearsign [filename]"
+msgstr "--clearsign [nume_fi�ier]"
+
+#: g10/g10.c:2148
+msgid "--decrypt [filename]"
+msgstr "--decrypt [nume_fi�ier]"
+
+#: g10/g10.c:2159
+msgid "--sign-key user-id"
+msgstr "--sign-key id-utilizator"
+
+#: g10/g10.c:2167
+msgid "--lsign-key user-id"
+msgstr "--lsign-key id-utilizator"
+
+#: g10/g10.c:2175
+msgid "--nrsign-key user-id"
+msgstr "--nrsign-key id-utilizator"
+
+#: g10/g10.c:2183
+msgid "--nrlsign-key user-id"
+msgstr "--nrlsign-key id-utilizator"
+
+#: g10/g10.c:2191
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key id-utilizator [comenzi]"
+
+#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#, c-format
+msgid "can't open %s: %s\n"
+msgstr "nu pot deschide %s: %s\n"
+
+#: g10/g10.c:2262
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
+
+#: g10/g10.c:2354
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "eliminarea armurii a e�uat: %s\n"
+
+#: g10/g10.c:2362
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "punerea armurii a e�uat: %s\n"
+
+#: g10/g10.c:2449
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "algoritm hash invalid `%s'\n"
+
+#: g10/g10.c:2535
+msgid "[filename]"
+msgstr "[nume_fi�ier]"
+
+#: g10/g10.c:2539
+msgid "Go ahead and type your message ...\n"
+msgstr "Da�i-i drumul �i scri�i mesajul ...\n"
+
+#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/verify.c:142
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "nu pot deschide `%s'\n"
+
+#: g10/g10.c:2815
+msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
+msgstr "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii �i s� se termine cu un '='\n"
+
+#: g10/g10.c:2824
+msgid "a user notation name must contain the '@' character\n"
+msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+
+#: g10/g10.c:2832
+msgid "a notation value must not use any control characters\n"
+msgstr "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
+
+#: g10/g10.c:2869
+msgid "the given certification policy URL is invalid\n"
+msgstr "URL-ul politicii de certificare furnizat este invalid\n"
+
+#: g10/g10.c:2871
+msgid "the given signature policy URL is invalid\n"
+msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "ia cheile de pe acest inel de chei"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "d� numai un avertisment la conflicte de timestamp"
+
+#: g10/gpgv.c:99
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Folosire: gpgv [op�iuni] [fi�iere] (-h pentru ajutor)"
+
+#: g10/gpgv.c:102
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Sintax�: gpg [op�iuni] [fi�iere]\n"
+"Verific� semn�turi folosind cheile cunoscute ca fiind de �ncredere\n"
+
+#: g10/armor.c:321
+#, c-format
+msgid "armor: %s\n"
+msgstr "armur�: %s\n"
+
+#: g10/armor.c:350
+msgid "invalid armor header: "
+msgstr "header armur� invalid: "
+
+#: g10/armor.c:357
+msgid "armor header: "
+msgstr "header armur�: "
+
+#: g10/armor.c:368
+msgid "invalid clearsig header\n"
+msgstr "header clearsig invalid\n"
+
+#: g10/armor.c:420
+msgid "nested clear text signatures\n"
+msgstr "semn�turi text �n clar �ncuib�rite\n"
+
+#: g10/armor.c:544
+msgid "invalid dash escaped line: "
+msgstr "linie cu liniu�� escape invalid�: "
+
+#: g10/armor.c:556
+msgid "unexpected armor:"
+msgstr "armur� nea�teptat�:"
+
+#: g10/armor.c:682 g10/armor.c:1258
+#, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "caracter radix64 invalid %02x s�rit\n"
+
+#: g10/armor.c:725
+msgid "premature eof (no CRC)\n"
+msgstr "eof prematur (nici un CRC)\n"
+
+#: g10/armor.c:759
+msgid "premature eof (in CRC)\n"
+msgstr "eof prematur (�n CRC)\n"
+
+#: g10/armor.c:763
+msgid "malformed CRC\n"
+msgstr "CRC anormal\n"
+
+#: g10/armor.c:767 g10/armor.c:1295
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr "eroare CRC; %06lx - %06lx\n"
+
+#: g10/armor.c:787
+msgid "premature eof (in Trailer)\n"
+msgstr "eof prematur (�n Trailer)\n"
+
+#: g10/armor.c:791
+msgid "error in trailer line\n"
+msgstr "eroare linia de trailer\n"
+
+#: g10/armor.c:1073
+msgid "no valid OpenPGP data found.\n"
+msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
+
+#: g10/armor.c:1078
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
+
+#: g10/armor.c:1082
+msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr "caracter printabil �n ghilimele �n armur� - probabil a fost folosit un MTA cu bug-uri\n"
+
+#: g10/pkclist.c:63 g10/revoke.c:603
+msgid "No reason specified"
+msgstr "Nici un motiv specificat"
+
+#: g10/pkclist.c:65 g10/revoke.c:605
+msgid "Key is superseded"
+msgstr "Cheia este �nlocuit�"
+
+#: g10/pkclist.c:67 g10/revoke.c:604
+msgid "Key has been compromised"
+msgstr "Cheia a fost compromis�"
+
+#: g10/pkclist.c:69 g10/revoke.c:606
+msgid "Key is no longer used"
+msgstr "Cheia nu mai este folosit�"
+
+#: g10/pkclist.c:71 g10/revoke.c:607
+msgid "User ID is no longer valid"
+msgstr "ID utilizator nu mai este valid"
+
+#: g10/pkclist.c:75
+msgid "reason for revocation: "
+msgstr "motiv pentru revocare: "
+
+#: g10/pkclist.c:92
+msgid "revocation comment: "
+msgstr "comentariu revocare: "
+
+#. a string with valid answers
+#: g10/pkclist.c:254
+msgid "iImMqQsS"
+msgstr "iImMtTsS"
+
+#: g10/pkclist.c:262
+#, c-format
+msgid ""
+"No trust value assigned to:\n"
+"%4u%c/%08lX %s \""
+msgstr ""
+"Nici o valoare de �ncredere atribuit� lui:\n"
+"%4u%c/%08lX %s \""
+
+#: g10/pkclist.c:290 g10/mainproc.c:1428
+msgid "                aka \""
+msgstr "                aka \""
+
+#: g10/pkclist.c:301
+msgid ""
+"Please decide how far you trust this user to correctly\n"
+"verify other users' keys (by looking at passports,\n"
+"checking fingerprints from different sources...)?\n"
+"\n"
+msgstr ""
+"V� rug�m decide�i c�t de mult� �ncredere ave�i �n acest utilizator\n"
+"pentru a verifica cheile altor utilizatori (privind la pa�apoarte,\n"
+"verific�nd amprentele din diferite surse...)?\n"
+"\n"
+
+#: g10/pkclist.c:304
+#, c-format
+msgid " %d = Don't know\n"
+msgstr " %d = Nu �tiu\n"
+
+#: g10/pkclist.c:305
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = NU am �ncredere\n"
+
+#: g10/pkclist.c:306
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = Am o �ncredere marginal�\n"
+
+#: g10/pkclist.c:307
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = Am toat� �ncrederea\n"
+
+#: g10/pkclist.c:309
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = Am �ncredere suprem�\n"
+
+#. not yet implemented
+#: g10/pkclist.c:312
+msgid " i = please show me more information\n"
+msgstr " i = arat�-mi mai multe informa�ii\n"
+
+#: g10/pkclist.c:315
+msgid " m = back to the main menu\n"
+msgstr " m = �napoi la meniul principal\n"
+
+#: g10/pkclist.c:318
+msgid " s = skip this key\n"
+msgstr " s = s�ri peste cheia asta\n"
+
+#: g10/pkclist.c:319
+msgid " q = quit\n"
+msgstr " t = termin�\n"
+
+#: g10/pkclist.c:326 g10/revoke.c:631
+msgid "Your decision? "
+msgstr "Decizia d-voastr�? "
+
+#: g10/pkclist.c:347
+msgid "Do you really want to set this key to ultimate trust? "
+msgstr "Dori�i �ntr-adev�r s� seta�i aceast� cheie cu �ncredere suprem�? "
+
+#: g10/pkclist.c:361
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificatele ce conduc la o cheie cu �ncredere suprem�:\n"
+
+#: g10/pkclist.c:436
+#, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "cheia %08lX: cheia a fost revocat�!\n"
+
+#: g10/pkclist.c:443 g10/pkclist.c:455 g10/pkclist.c:555
+msgid "Use this key anyway? "
+msgstr "Folosi�i oricum aceast� cheie? "
+
+#: g10/pkclist.c:448
+#, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "cheie %08lX: subcheia a fost revocat�!\n"
+
+#: g10/pkclist.c:469
+#, c-format
+msgid "%08lX: key has expired\n"
+msgstr "%08lX: cheia a expirat\n"
+
+#: g10/pkclist.c:479
+#, c-format
+msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr "%08lX: Nu exist� nici o indica�ie c� aceast� cheie apar�ine �ntr-adev�r proprietarului\n"
+
+#: g10/pkclist.c:485
+#, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "%08lX: Noi NU avem �ncredere �n acest� cheie\n"
+
+#: g10/pkclist.c:491
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+msgstr ""
+"%08lX: Nu este sigur dac� aceast� cheie apar�ine �ntr-adev�r\n"
+"proprietarului, dar este oricum acceptat�\n"
+
+#: g10/pkclist.c:497
+msgid "This key probably belongs to the owner\n"
+msgstr "Aceast� cheie apar�ine probabil proprietarului\n"
+
+#: g10/pkclist.c:502
+msgid "This key belongs to us\n"
+msgstr "Aceast� cheie ne apar�ine\n"
+
+#: g10/pkclist.c:550
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID.  If you *really* know what you are doing,\n"
+"you may answer the next question with yes\n"
+"\n"
+msgstr ""
+"NU este sigur c� cheie apar�ine persoanei numite �n ID-ul\n"
+"utilizator.  Dac� �ti�i *cu adev�rat* ce face�i, pute�i\n"
+"r�spunde cu da la urm�toarea �ntrebare\n"
+"\n"
+
+#: g10/pkclist.c:564 g10/pkclist.c:594
+msgid "WARNING: Using untrusted key!\n"
+msgstr "AVERTISMENT: Folosi�i o cheie f�r� �ncredere!\n"
+
+#: g10/pkclist.c:605
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+
+#: g10/pkclist.c:606
+msgid "         This could mean that the signature is forgery.\n"
+msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
+
+#: g10/pkclist.c:612
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
+
+#: g10/pkclist.c:617
+msgid "Note: This key has been disabled.\n"
+msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
+
+#: g10/pkclist.c:622
+msgid "Note: This key has expired!\n"
+msgstr "Not�: Aceast� cheie a expirat!\n"
+
+#: g10/pkclist.c:633
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
+
+#: g10/pkclist.c:635
+msgid "         There is no indication that the signature belongs to the owner.\n"
+msgstr "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
+
+#: g10/pkclist.c:643
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
+
+#: g10/pkclist.c:644
+msgid "         The signature is probably a FORGERY.\n"
+msgstr "         Semn�tura este probabil un FALS.\n"
+
+#: g10/pkclist.c:652
+msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de �ncredere!\n"
+
+#: g10/pkclist.c:654
+msgid "         It is not certain that the signature belongs to the owner.\n"
+msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
+
+#: g10/pkclist.c:808 g10/pkclist.c:832 g10/pkclist.c:990 g10/pkclist.c:1050
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: s�rit�: %s\n"
+
+#: g10/pkclist.c:818 g10/pkclist.c:1022
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
+
+#: g10/pkclist.c:849
+msgid "You did not specify a user ID. (you may use \"-r\")\n"
+msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
+
+#: g10/pkclist.c:862
+msgid ""
+"\n"
+"Enter the user ID.  End with an empty line: "
+msgstr ""
+"\n"
+"Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
+
+#: g10/pkclist.c:878
+msgid "No such user ID.\n"
+msgstr "Nu exist� acest ID utilizator.\n"
+
+#: g10/pkclist.c:883 g10/pkclist.c:965
+msgid "skipped: public key already set as default recipient\n"
+msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
+
+#: g10/pkclist.c:901
+msgid "Public key is disabled.\n"
+msgstr "Cheia public� este deactivat�.\n"
+
+#: g10/pkclist.c:908
+msgid "skipped: public key already set\n"
+msgstr "s�rit�: cheia public� setat� deja\n"
+
+#: g10/pkclist.c:957
+#, c-format
+msgid "unknown default recipient `%s'\n"
+msgstr "destinatar implicit necunoscut `%s'\n"
+
+#: g10/pkclist.c:1002
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: s�rit�: cheia public� este deactivat�\n"
+
+#: g10/pkclist.c:1057
+msgid "no valid addressees\n"
+msgstr "nici un destinatar valid\n"
+
+#: g10/keygen.c:191
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr "preferin�a %c%lu nu este valid�\n"
+
+#: g10/keygen.c:198
+#, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "preferin�a %c%lu duplicat�\n"
+
+#: g10/keygen.c:203
+#, c-format
+msgid "too many `%c' preferences\n"
+msgstr "prea multe preferin�e `%c'\n"
+
+#: g10/keygen.c:273
+msgid "invalid character in preference string\n"
+msgstr "caracter invalid �n �ir preferin�e\n"
+
+#: g10/keygen.c:533
+msgid "writing direct signature\n"
+msgstr "scriu semn�tur� direct�\n"
+
+#: g10/keygen.c:572
+msgid "writing self signature\n"
+msgstr "scriu auto semn�tur�\n"
+
+#: g10/keygen.c:616
+msgid "writing key binding signature\n"
+msgstr "scriu semn�tur� legat� de cheie\n"
+
+#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
+
+#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "lungime cheie rotunjit� la %u bi�i\n"
+
+#: g10/keygen.c:950
+msgid "Please select what kind of key you want:\n"
+msgstr "Selecta�i ce fel de cheie dori�i:\n"
+
+#: g10/keygen.c:952
+#, c-format
+msgid "   (%d) DSA and ElGamal (default)\n"
+msgstr "   (%d) DSA �i ElGamal (implicit)\n"
+
+#: g10/keygen.c:953
+#, c-format
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (numai semn�tur�)\n"
+
+#: g10/keygen.c:955
+#, c-format
+msgid "   (%d) ElGamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (numai cifrare)\n"
+
+#: g10/keygen.c:957
+#, c-format
+msgid "   (%d) ElGamal (sign and encrypt)\n"
+msgstr "   (%d) ElGamal (semn�tur� �i cifrare)\n"
+
+#: g10/keygen.c:958
+#, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (numai semn�tur�)\n"
+
+#: g10/keygen.c:960
+#, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (numai cifrare)\n"
+
+#: g10/keygen.c:962
+#, c-format
+msgid "   (%d) RSA (sign and encrypt)\n"
+msgstr "   (%d) RSA (semn�tur� �i cifrare)\n"
+
+#: g10/keygen.c:965 g10/keyedit.c:616
+msgid "Your selection? "
+msgstr "Selec�ia d-voastr�? "
+
+#: g10/keygen.c:991
+msgid ""
+"The use of this algorithm is only supported by GnuPG.  You will not be\n"
+"able to use this key to communicate with PGP users.  This algorithm is also\n"
+"very slow, and may not be as secure as the other choices.\n"
+msgstr ""
+"Folosirea acestui algoritm este suportat� numai de GnuPG.  Nu ve�i putea\n"
+"folosi aceast� cheie pentru a comunica cu al�i utilizatori PGP.  Mai mult,\n"
+"acest algoritm este foarte lent �i ar putea fi mai pu�in sigur dec�t\n"
+"celelalte op�iuni.\n"
+
+#: g10/keygen.c:996
+msgid "Create anyway? "
+msgstr "Crea�i oricum? "
+
+#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+msgid "Invalid selection.\n"
+msgstr "Selec�ie invalid�.\n"
+
+#: g10/keygen.c:1024
+#, c-format
+msgid ""
+"About to generate a new %s keypair.\n"
+"              minimum keysize is  768 bits\n"
+"              default keysize is 1024 bits\n"
+"    highest suggested keysize is 2048 bits\n"
+msgstr ""
+"Pe cale s� genera�i o nou� pereche de chei %s.\n"
+"              lungimea minim� este  768 bits\n"
+"           lungimea implicit� este 1024 bits\n"
+" cea mai lung� cheie sugerat� este 2048 bits\n"
+
+#: g10/keygen.c:1033
+msgid "What keysize do you want? (1024) "
+msgstr "Ce lungime de cheie dori�i? (1024) "
+
+#: g10/keygen.c:1038
+msgid "DSA only allows keysizes from 512 to 1024\n"
+msgstr "DSA permite numai chei de la 512 la 1024\n"
+
+#: g10/keygen.c:1040
+msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgstr "lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru RSA.\n"
+
+#: g10/keygen.c:1043
+msgid "keysize too small; 768 is smallest value allowed.\n"
+msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
+
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * 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:1054
+#, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
+
+#: g10/keygen.c:1059
+msgid ""
+"Keysizes larger than 2048 are not suggested because\n"
+"computations take REALLY long!\n"
+msgstr ""
+"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
+"deoarece calculele iau FOARTE MULT timp!\n"
+
+#: g10/keygen.c:1062
+msgid "Are you sure that you want this keysize? "
+msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie?"
+
+#: g10/keygen.c:1063
+msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+msgstr "Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� este de asemenea vulnerabil� la atacuri!\n"
+
+#: g10/keygen.c:1072
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Lungimea cheii necesar� este %u bi�i\n"
+
+#: g10/keygen.c:1075 g10/keygen.c:1079
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rotunjit� prin adaos la %u bi�i\n"
+
+#: g10/keygen.c:1130
+msgid ""
+"Please specify how long the key should be valid.\n"
+"         0 = key does not expire\n"
+"      <n>  = key expires in n days\n"
+"      <n>w = key expires in n weeks\n"
+"      <n>m = key expires in n months\n"
+"      <n>y = key expires in n years\n"
+msgstr ""
+"Specifica�i c�t de mult timp dori�i s� fie valid� cheia.\n"
+"         0 = cheia nu expir�\n"
+"      <n>  = cheia expir� �n n zile\n"
+"      <n>w = cheia expir� �n n s�pt�m�ni\n"
+"      <n>m = cheia expir� �n n luni\n"
+"      <n>y = cheia expir� �n n ani\n"
+
+#: g10/keygen.c:1139
+msgid ""
+"Please specify how long the signature should be valid.\n"
+"         0 = signature does not expire\n"
+"      <n>  = signature expires in n days\n"
+"      <n>w = signature expires in n weeks\n"
+"      <n>m = signature expires in n months\n"
+"      <n>y = signature expires in n years\n"
+msgstr ""
+"Specifica�i c�t de mult timp dori�i s� fie valid� semn�tura.\n"
+"         0 = semn�tura nu expir�\n"
+"      <n>  = semn�tura expir� �n n zile\n"
+"      <n>w = semn�tura expir� �n n s�pt�m�ni\n"
+"      <n>m = semn�tura expir� �n n luni\n"
+"      <n>y = semn�tura expir� �n n ani\n"
+
+#: g10/keygen.c:1161
+msgid "Key is valid for? (0) "
+msgstr "Cheia este valid� pentru? (0) "
+
+#: g10/keygen.c:1163
+msgid "Signature is valid for? (0) "
+msgstr "Semn�tura este valid� pentru? (0) "
+
+#: g10/keygen.c:1168
+msgid "invalid value\n"
+msgstr "valoare invalid�\n"
+
+#: g10/keygen.c:1173
+#, c-format
+msgid "%s does not expire at all\n"
+msgstr "%s nu expir� deloc\n"
+
+#. print the date when the key expires
+#: g10/keygen.c:1180
+#, c-format
+msgid "%s expires at %s\n"
+msgstr "%s expir� la %s\n"
+
+#: g10/keygen.c:1186
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Sistemul d-voastr� nu poate afi�a date dup� 2038.\n"
+"Totu�i, acestea vor fi corect m�nuite p�n� �n 2106.\n"
+
+#: g10/keygen.c:1191
+msgid "Is this correct (y/n)? "
+msgstr "Este aceasta corect (d/n)? "
+
+#: g10/keygen.c:1234
+msgid ""
+"\n"
+"You need a User-ID to identify your key; the software constructs the user id\n"
+"from Real Name, Comment and Email Address in this form:\n"
+"    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
+"\n"
+msgstr ""
+"\n"
+"Ave�i nevoie de un ID utilizator pentru a identifica cheia; software-ul\n"
+"construie�te id-ul utilizator din Numele Real, Comentariu �i Adresa de Email\n"
+"�n aceast� form�:\n"
+"    \"Popa Ioan (popic�) <[email protected]>\"\n"
+"\n"
+
+#: g10/keygen.c:1246
+msgid "Real name: "
+msgstr "Nume real: "
+
+#: g10/keygen.c:1254
+msgid "Invalid character in name\n"
+msgstr "Caracter invalid �n nume\n"
+
+#: g10/keygen.c:1256
+msgid "Name may not start with a digit\n"
+msgstr "Numele nu poate �ncepe cu o cifr�\n"
+
+#: g10/keygen.c:1258
+msgid "Name must be at least 5 characters long\n"
+msgstr "Numele trebuie s� fie de cel pu�in 5 caractere\n"
+
+#: g10/keygen.c:1266
+msgid "Email address: "
+msgstr "Adres� de email: "
+
+#: g10/keygen.c:1277
+msgid "Not a valid email address\n"
+msgstr "Nu este o adres� de email valid�\n"
+
+#: g10/keygen.c:1285
+msgid "Comment: "
+msgstr "Comentariu: "
+
+#: g10/keygen.c:1291
+msgid "Invalid character in comment\n"
+msgstr "Caracter invalid �n comentariu\n"
+
+#: g10/keygen.c:1314
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "Folosi�i setul de caractere `%s'\n"
+
+#: g10/keygen.c:1320
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+"    \"%s\"\n"
+"\n"
+msgstr ""
+"A�i selectat acest ID-UTILIZATOR:\n"
+"    \"%s\"\n"
+"\n"
+
+#: g10/keygen.c:1324
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "V� rug�m nu pune�i adresa de email �n numele real sau comentariu\n"
+
+#: g10/keygen.c:1329
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoTt"
+
+#: g10/keygen.c:1339
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (T)Termin�? "
+
+#: g10/keygen.c:1340
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Schimb� (N)ume, (C)omentariu, (E)mail sau (O)K/(T)Termin�? "
+
+#: g10/keygen.c:1359
+msgid "Please correct the error first\n"
+msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
+
+#: g10/keygen.c:1398
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
+"\n"
+
+#: g10/keygen.c:1407 g10/keyedit.c:827
+msgid "passphrase not correctly repeated; try again"
+msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
+
+#: g10/keygen.c:1408
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:1414
+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"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"Nu ave�i nevoie de o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
+"O s� o fac oricum.  Pute�i schimba fraza-parol� oric�nd, folosind acest\n"
+"program cu op�iunea \"--edit-key\".\n"
+
+#: g10/keygen.c:1435
+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"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"Trebuie s� gener�m o gr�mad� de octe�i aleatori. Este o idee bun� s� face�i\n"
+"altceva (tasta�i la tastatur�, mi�ca�i mausul, utiliza�i discurile)\n"
+"�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
+"numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
+
+#: g10/keygen.c:2000
+msgid "DSA keypair will have 1024 bits.\n"
+msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
+
+#: g10/keygen.c:2054
+msgid "Key generation canceled.\n"
+msgstr "Generarea cheii a fost anulat�.\n"
+
+#: g10/keygen.c:2161 g10/keygen.c:2249
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "scriu cheia public� �n `%s'\n"
+
+#: g10/keygen.c:2162 g10/keygen.c:2251
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: g10/keygen.c:2238
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "nu am g�sit nici un inel de chei public de scris: %s\n"
+
+#: g10/keygen.c:2244
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
+
+#: g10/keygen.c:2258
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
+
+#: g10/keygen.c:2265
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
+
+#: g10/keygen.c:2285
+msgid "public and secret key created and signed.\n"
+msgstr "cheile secret� �i public� au fost create �i semnate.\n"
+
+#: g10/keygen.c:2286
+msgid "key marked as ultimately trusted.\n"
+msgstr "cheie marcat� ca av�nd �ncredere suprem�.\n"
+
+#: g10/keygen.c:2297
+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 ""
+"De notat c� aceast� cheie nu poate fi folosit� pentru cifrare.  Poate dori�i\n"
+"s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
+"acest scop.\n"
+
+#: g10/keygen.c:2309 g10/keygen.c:2428
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Generarea cheii a e�uat: %s\n"
+
+#: g10/keygen.c:2355 g10/sign.c:261
+#, c-format
+msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgstr "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu ceasul)\n"
+
+#: g10/keygen.c:2357 g10/sign.c:263
+#, c-format
+msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu ceasul)\n"
+
+#: g10/keygen.c:2366
+msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "NOT�: crearea de subchei pentru chei v3 nu este conform OpenPGP\n"
+
+#: g10/keygen.c:2395
+msgid "Really create? "
+msgstr "Crea�i �ntr-adev�r? "
+
+#: g10/decrypt.c:96 g10/encode.c:780
+msgid "--output doesn't work for this command\n"
+msgstr "--output nu merge pentru aceast� comand�\n"
+
+#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: can't open: %s\n"
+msgstr "%s: nu pot deschide: %s\n"
+
+#: g10/encode.c:209 g10/sign.c:1056
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: g10/encode.c:214
+msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+msgstr "nu pot crea un pachet ESK simetric datorit� modului S2K\n"
+
+#: g10/encode.c:233 g10/encode.c:498
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "`%s' deja compresat\n"
+
+#: g10/encode.c:301 g10/encode.c:534
+#, c-format
+msgid "%s: WARNING: empty file\n"
+msgstr "%s: AVERTISMENT: fi�ier gol\n"
+
+#: g10/encode.c:416
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr "�n modul --pgp2 pute�i cifra numai cu chei RSA de 2048 bi�i sau mai pu�in\n"
+
+#: g10/encode.c:432
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "citesc din `%s'\n"
+
+#: g10/encode.c:468
+msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr "nu pot folosi cifrul IDEA pentru pentru toate cheile pentru care cifra�i.\n"
+
+#: g10/encode.c:479 g10/encode.c:662
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
+
+#: g10/encode.c:576 g10/sign.c:770
+#, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "for��nd algoritmul de compresie %s (%d) viola�i preferin�ele destinatarului\n"
+
+#: g10/encode.c:721
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
+
+#: g10/encode.c:753
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s cifrat pentru: \"%s\"\n"
+
+#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+
+#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "eroare la citire keyblock: %s\n"
+
+#: g10/export.c:222
+#, c-format
+msgid "key %08lX: not a rfc2440 key - skipped\n"
+msgstr "cheia %08lX: nu e o cheie rfc2440 - s�rit�\n"
+
+#: g10/export.c:238
+#, c-format
+msgid "key %08lX: not protected - skipped\n"
+msgstr "cheia %08lX: nu e protejat� - s�rit�\n"
+
+#: g10/export.c:246
+#, c-format
+msgid "key %08lX: PGP 2.x style key - skipped\n"
+msgstr "cheia %08lX: cheie stil PGP 2.x - s�rit�\n"
+
+#. I hope this warning doesn't confuse people.
+#: g10/export.c:321
+#, c-format
+msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
+msgstr "AVERTISMENT: cheia secret� %08lX nu are un checksum SK simplu\n"
+
+#: g10/export.c:347
+msgid "WARNING: nothing exported\n"
+msgstr "AVERTISMENT: nimic exportat\n"
+
+#: g10/getkey.c:150
+msgid "too many entries in pk cache - disabled\n"
+msgstr "prea multe intr�ri �n cache-ul pk - deactivat\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:2521
+msgid "[User id not found]"
+msgstr "[ID utilizator nu a fost g�sit]"
+
+#: g10/getkey.c:1557
+#, c-format
+msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+msgstr "Cheia invalid� %08lX f�cut� valid� de --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2009
+#, c-format
+msgid "no secret subkey for public subkey %08lX - ignoring\n"
+msgstr "nici o subcheie secret� pentru subcheia public� %08lX - ignorat�\n"
+
+#: g10/getkey.c:2237
+#, c-format
+msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgstr "folosim cheia secundar� %08lX �n loc de cheia primar� %08lX\n"
+
+#: g10/getkey.c:2284
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "cheia %08lX: cheie secret� f�r� cheie public� - s�rit�\n"
+
+#: g10/import.c:259
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "bloc de tip %d s�rit\n"
+
+#: g10/import.c:268
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr "%lu chei procesate p�n� acum\n"
+
+#: g10/import.c:273
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: g10/import.c:285
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Num�r total procesate: %lu\n"
+
+#: g10/import.c:287
+#, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "      chei noi s�rite: %lu\n"
+
+#: g10/import.c:290
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr "  f�r� ID-uri utilizator: %lu\n"
+
+#: g10/import.c:292
+#, c-format
+msgid "              imported: %lu"
+msgstr "               importate: %lu"
+
+#: g10/import.c:298
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr "             neschimbate: %lu\n"
+
+#: g10/import.c:300
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr "   noi ID-uri utilizator: %lu\n"
+
+#: g10/import.c:302
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr "             noi subchei: %lu\n"
+
+#: g10/import.c:304
+#, c-format
+msgid "        new signatures: %lu\n"
+msgstr "           noi semn�turi: %lu\n"
+
+#: g10/import.c:306
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr "    noi revoc�ri de chei: %lu\n"
+
+#: g10/import.c:308
+#, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "     chei secrete citite: %lu\n"
+
+#: g10/import.c:310
+#, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "  chei secrete importate: %lu\n"
+
+#: g10/import.c:312
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "chei secrete neschimbate: %lu\n"
+
+#: g10/import.c:314
+#, c-format
+msgid "          not imported: %lu\n"
+msgstr "            ne importate: %lu\n"
+
+#: g10/import.c:599
+msgid "NOTE: Elgamal primary key detected - this may take some time to import\n"
+msgstr "NOT�: cheie primar� Elgamal detectat� - poate lua ceva timp pentru a importa\n"
+
+#: g10/import.c:613 g10/import.c:875
+#, c-format
+msgid "key %08lX: no user ID\n"
+msgstr "cheia %08lX: nici un ID utilizator\n"
+
+#: g10/import.c:634
+#, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "cheia %08lX: subcheia HPK corupt� a fost reparat�\n"
+
+#: g10/import.c:649
+#, c-format
+msgid "key %08lX: accepted non self-signed user ID '%s'\n"
+msgstr "cheia %08lX: am acceptat ID-ul utilizator ce nu e auto-semnat '%s'\n"
+
+#: g10/import.c:656
+#, c-format
+msgid "key %08lX: no valid user IDs\n"
+msgstr "cheia %08lX: nici un ID utilizator valid\n"
+
+#: g10/import.c:658
+msgid "this may be caused by a missing self-signature\n"
+msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
+
+#: g10/import.c:668 g10/import.c:955
+#, c-format
+msgid "key %08lX: public key not found: %s\n"
+msgstr "cheia %08lX: cheia public� nu a fost g�sit�: %s\n"
+
+#: g10/import.c:673
+#, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "cheia %08lX: cheie nou� - s�rit�\n"
+
+#: g10/import.c:683
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
+
+#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "scriu �n `%s'\n"
+
+#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
+
+#: g10/import.c:708
+#, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
+msgstr "cheia %08lX: cheia public� \"%s\" importat�\n"
+
+#: g10/import.c:730
+#, c-format
+msgid "key %08lX: doesn't match our copy\n"
+msgstr "cheia %08lX: nu se potrive�te cu copia noastr�\n"
+
+#: g10/import.c:747 g10/import.c:972
+#, c-format
+msgid "key %08lX: can't locate original keyblock: %s\n"
+msgstr "cheia %08lX: nu pot g�si keyblock-ul original: %s\n"
+
+#: g10/import.c:754 g10/import.c:978
+#, c-format
+msgid "key %08lX: can't read original keyblock: %s\n"
+msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n"
+
+#: g10/import.c:785
+#, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
+msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n"
+
+#: g10/import.c:788
+#, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
+msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n"
+
+#: g10/import.c:791
+#, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
+msgstr "cheia %08lX: \"%s\" 1 nou� semn�tur�\n"
+
+#: g10/import.c:794
+#, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
+msgstr "cheia %08lX: \"%s\" %d noi semn�turi\n"
+
+#: g10/import.c:797
+#, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
+msgstr "key %08lX: \"%s\" 1 nou� subcheie\n"
+
+#: g10/import.c:800
+#, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
+msgstr "key %08lX: \"%s\" %d noi subchei\n"
+
+#: g10/import.c:819
+#, c-format
+msgid "key %08lX: \"%s\" not changed\n"
+msgstr "key %08lX: \"%s\" nu a fost schimbat�\n"
+
+#: g10/import.c:881
+#, c-format
+msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
+msgstr "key %08lX: cheie secret� cu cifru invalid %d - s�rit�\n"
+
+#: g10/import.c:896
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "nici un inel de chei secret implicit: %s\n"
+
+#: g10/import.c:907
+#, c-format
+msgid "key %08lX: secret key imported\n"
+msgstr "cheia %08lX: cheie secret� importat�\n"
+
+#. we can't merge secret keys
+#: g10/import.c:913
+#, c-format
+msgid "key %08lX: already in secret keyring\n"
+msgstr "cheia %08lX: deja �n inelul de chei secret\n"
+
+#: g10/import.c:920
+#, c-format
+msgid "key %08lX: secret key not found: %s\n"
+msgstr "cheia %08lX: cheia secret� nu a fost g�sit�: %s\n"
+
+#: g10/import.c:949
+#, c-format
+msgid "key %08lX: no public key - can't apply revocation certificate\n"
+msgstr "cheia %08lX: nici o cheie public� - nu pot aplica certificatul de revocare\n"
+
+#: g10/import.c:989
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
+msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n"
+
+#: g10/import.c:1021
+#, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
+msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n"
+
+#: g10/import.c:1084
+#, c-format
+msgid "key %08lX: no user ID for signature\n"
+msgstr "cheia %08lX: nici un ID utilizator pentru semn�tur�\n"
+
+#: g10/import.c:1097
+#, c-format
+msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "cheia %08lX: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s\"\n"
+
+#: g10/import.c:1099
+#, c-format
+msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
+msgstr "cheia %08lX: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
+
+#: g10/import.c:1114
+#, c-format
+msgid "key %08lX: no subkey for key binding\n"
+msgstr "cheia %08lX: nici o subcheie legat� de cheie\n"
+
+#: g10/import.c:1122 g10/import.c:1163
+#, c-format
+msgid "key %08lX: unsupported public key algorithm\n"
+msgstr "cheia %08lX: algoritm cu cheie public� nesuportat\n"
+
+#: g10/import.c:1123
+#, c-format
+msgid "key %08lX: invalid subkey binding\n"
+msgstr "cheia %08lX: leg�tur� subcheie invalid�\n"
+
+#. Delete the last binding
+#. sig since this one is
+#. newer
+#: g10/import.c:1135
+#, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "cheia %08lX: am �ters multiple leg�turi de subchei\n"
+
+#: g10/import.c:1155
+#, c-format
+msgid "key %08lX: no subkey for key revocation\n"
+msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n"
+
+#: g10/import.c:1164
+#, c-format
+msgid "key %08lX: invalid subkey revocation\n"
+msgstr "cheia %08lX: revocare de subcheie invalid�\n"
+
+#. Delete the last revocation
+#. sig since this one is
+#. newer
+#: g10/import.c:1175
+#, c-format
+msgid "key %08lX: removed multiple subkey revocation\n"
+msgstr "cheia %08lX: am �ters multiple revoc�ri de subcheie\n"
+
+#: g10/import.c:1212
+#, c-format
+msgid "key %08lX: skipped user ID '"
+msgstr "cheia %08lX: am s�rit ID-ul utilizator '"
+
+#: g10/import.c:1235
+#, c-format
+msgid "key %08lX: skipped subkey\n"
+msgstr "cheia %08lX: am s�rit subcheia\n"
+
+#. here we violate the rfc a bit by still allowing
+#. * 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:1261
+#, c-format
+msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+msgstr "cheia %08lX: semn�tura nu poate fi exportat� (clasa %02x) - s�rit�\n"
+
+#: g10/import.c:1270
+#, c-format
+msgid "key %08lX: revocation certificate at wrong place - skipped\n"
+msgstr "cheia %08lX: certificat de revocare �ntr-un loc gre�it - s�rit\n"
+
+#: g10/import.c:1287
+#, c-format
+msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
+msgstr "cheia %08lX: certificat de revocare invalid: %s - s�rit\n"
+
+#: g10/import.c:1299
+#, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "cheia %08lX: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
+
+#: g10/import.c:1307
+#, c-format
+msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
+msgstr "cheia %08lX: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
+
+#: g10/import.c:1405
+#, c-format
+msgid "key %08lX: duplicated user ID detected - merged\n"
+msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n"
+
+#: g10/import.c:1464
+#, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
+msgstr "AVERTISMENT: cheia %08lX poate fi revocat�: aduc revocarea cheii %08lX\n"
+
+#: g10/import.c:1478
+#, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
+msgstr "AVERTISMENT: cheia %08lX poate fi revocat�: cheia de revocare %08lX nu este prezent�.\n"
+
+#: g10/import.c:1535
+#, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
+msgstr "cheia %08lX: am ad�ugat certificatul de revocare \"%s\"\n"
+
+#: g10/import.c:1566
+#, c-format
+msgid "key %08lX: direct key signature added\n"
+msgstr "cheia %08lX: am ad�ugat semn�tura de cheie direct�\n"
+
+#: g10/keyedit.c:149
+msgid "[revocation]"
+msgstr "[revocare]"
+
+#: g10/keyedit.c:150
+msgid "[self-signature]"
+msgstr "[auto-semn�tur�]"
+
+#: g10/keyedit.c:221 g10/keylist.c:148
+msgid "1 bad signature\n"
+msgstr "1 semn�tur� incorect�\n"
+
+#: g10/keyedit.c:223 g10/keylist.c:150
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d semn�turi incorecte\n"
+
+#: g10/keyedit.c:225 g10/keylist.c:152
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
+
+#: g10/keyedit.c:227 g10/keylist.c:154
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
+
+#: g10/keyedit.c:229 g10/keylist.c:156
+msgid "1 signature not checked due to an error\n"
+msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
+
+#: g10/keyedit.c:231 g10/keylist.c:158
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
+
+#: g10/keyedit.c:233
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
+
+#: g10/keyedit.c:235
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
+
+#: g10/keyedit.c:362
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "ID utilizator \"%s\" a fost revocat."
+
+#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
+
+#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+msgid "  Unable to sign.\n"
+msgstr "  Nu pot semna.\n"
+
+#: g10/keyedit.c:382
+#, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "AVERISMENT: ID-ul utilizator \"%s\" nu este auto-semnat.\n"
+
+#: g10/keyedit.c:401
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"Auto-semn�tura pe \"%s\"\n"
+"este o semn�tur� stil PGP 2.x.\n"
+
+#: g10/keyedit.c:410
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
+
+#: g10/keyedit.c:424
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Semn�tura d-voastr� curent� pe \"%s\"\n"
+"a expirat.\n"
+
+#: g10/keyedit.c:428
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
+
+#. It's a local sig, and we want to make a
+#. exportable sig.
+#: g10/keyedit.c:449
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Semn�tura d-voastr� curent� pe \"%s\"\n"
+"semn�tur� local�.\n"
+
+#: g10/keyedit.c:453
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
+
+#: g10/keyedit.c:474
+#, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%s\" a fost deja semnat� local de cheia %08lX\n"
+
+#: g10/keyedit.c:478
+#, c-format
+msgid "\"%s\" was already signed by key %08lX\n"
+msgstr "\"%s\" a fost deja semnat� de cheia %08lX\n"
+
+#: g10/keyedit.c:483
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
+
+#: g10/keyedit.c:503
+#, c-format
+msgid "Nothing to sign with key %08lX\n"
+msgstr "Nimic de semnat cu cheia %08lX\n"
+
+#: g10/keyedit.c:518
+msgid "This key has expired!"
+msgstr "Aceast� cheie a expirat!"
+
+#: g10/keyedit.c:538
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "Aceast� cheie va expira pe %s.\n"
+
+#: g10/keyedit.c:542
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
+
+#: g10/keyedit.c:575
+msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgstr "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n modul --pgp2.\n"
+
+#: g10/keyedit.c:577
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
+
+#: g10/keyedit.c:600
+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 ""
+"C�t de atent a�i verificat c� cheia pe care sunte�i pe cale a o semna apar�ine\n"
+"�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
+"introduce�i \"0\".\n"
+
+#: g10/keyedit.c:604
+#, c-format
+msgid "   (0) I will not answer.%s\n"
+msgstr "   (0) Nu voi r�spunde.%s\n"
+
+#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+msgid " (default)"
+msgstr "(implicit)"
+
+#: g10/keyedit.c:606
+#, c-format
+msgid "   (1) I have not checked at all.%s\n"
+msgstr "   (1) Nu am verificat deloc.%s\n"
+
+#: g10/keyedit.c:608
+#, c-format
+msgid "   (2) I have done casual checking.%s\n"
+msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
+
+#: g10/keyedit.c:610
+#, c-format
+msgid "   (3) I have done very careful checking.%s\n"
+msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
+
+#: g10/keyedit.c:635
+msgid ""
+"Are you really sure that you want to sign this key\n"
+"with your key: \""
+msgstr ""
+"Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
+"aceast� cheie cu cheia d-voastr�: \""
+
+#: g10/keyedit.c:644
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr ""
+"\n"
+"Aceasta va fi o auto-semn�tur�.\n"
+
+#: g10/keyedit.c:648
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
+
+#: g10/keyedit.c:653
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
+
+#: g10/keyedit.c:660
+msgid ""
+"\n"
+"The signature will be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"Semn�tura va fi marcat� ca non-exportabil�.\n"
+
+#: g10/keyedit.c:664
+msgid ""
+"\n"
+"The signature will be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"Semn�tura va fi marcat� ca non-revocabil�.\n"
+
+#: g10/keyedit.c:669
+msgid ""
+"\n"
+"I have not checked this key at all.\n"
+msgstr ""
+"\n"
+"Nu am verificat aceast� cheie deloc.\n"
+
+#: g10/keyedit.c:673
+msgid ""
+"\n"
+"I have checked this key casually.\n"
+msgstr ""
+"\n"
+"Am verificat aceast� cheie superficial.\n"
+
+#: g10/keyedit.c:677
+msgid ""
+"\n"
+"I have checked this key very carefully.\n"
+msgstr ""
+"\n"
+"Am verificat aceast� cheie foarte atent.\n"
+
+#: g10/keyedit.c:686
+msgid "Really sign? "
+msgstr "Dori�i cu adev�rat s� semna�i?"
+
+#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
+#: g10/sign.c:312
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "semnarea a e�uat: %s\n"
+
+#: g10/keyedit.c:784
+msgid "This key is not protected.\n"
+msgstr "Aceast� cheie nu este protejat�.\n"
+
+#: g10/keyedit.c:788
+msgid "Secret parts of primary key are not available.\n"
+msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
+
+#: g10/keyedit.c:792
+msgid "Key is protected.\n"
+msgstr "Cheia este protejat�.\n"
+
+#: g10/keyedit.c:812
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Nu pot edita aceast� cheie: %s\n"
+
+#: g10/keyedit.c:818
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
+"\n"
+
+#: g10/keyedit.c:832
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
+"\n"
+
+#: g10/keyedit.c:835
+msgid "Do you really want to do this? "
+msgstr "Dori�i �ntr-adev�r s� face�i acest lucru?"
+
+#: g10/keyedit.c:899
+msgid "moving a key signature to the correct place\n"
+msgstr "mut o semn�tur� de cheie �n locul corect\n"
+
+#: g10/keyedit.c:941
+msgid "quit this menu"
+msgstr "ie�i din acest meniu"
+
+#: g10/keyedit.c:942
+msgid "q"
+msgstr "t"
+
+#: g10/keyedit.c:943
+msgid "save"
+msgstr "salveaz�"
+
+#: g10/keyedit.c:943
+msgid "save and quit"
+msgstr "salveaz� �i termin�"
+
+#: g10/keyedit.c:944
+msgid "help"
+msgstr "ajutor"
+
+#: g10/keyedit.c:944
+msgid "show this help"
+msgstr "afi�eaz� acest mesaj"
+
+#: g10/keyedit.c:946
+msgid "fpr"
+msgstr "ampr"
+
+#: g10/keyedit.c:946
+msgid "show fingerprint"
+msgstr "afi�eaz� amprenta"
+
+#: g10/keyedit.c:947
+msgid "list"
+msgstr "enumer�"
+
+#: g10/keyedit.c:947
+msgid "list key and user IDs"
+msgstr "enumer� chei �i ID-uri utilizator"
+
+#: g10/keyedit.c:948
+msgid "l"
+msgstr "l"
+
+#: g10/keyedit.c:949
+msgid "uid"
+msgstr "uid"
+
+#: g10/keyedit.c:949
+msgid "select user ID N"
+msgstr "selecteaz� ID utilizator N"
+
+#: g10/keyedit.c:950
+msgid "key"
+msgstr "cheie"
+
+#: g10/keyedit.c:950
+msgid "select secondary key N"
+msgstr "selecteaz� cheie secundar� N"
+
+#: g10/keyedit.c:951
+msgid "check"
+msgstr "verific�"
+
+#: g10/keyedit.c:951
+msgid "list signatures"
+msgstr "enumer� semn�turi"
+
+#: g10/keyedit.c:952
+msgid "c"
+msgstr "c"
+
+#: g10/keyedit.c:953
+msgid "sign"
+msgstr "semneaz�"
+
+#: g10/keyedit.c:953
+msgid "sign the key"
+msgstr "semneaz� cheia"
+
+#: g10/keyedit.c:954
+msgid "s"
+msgstr "s"
+
+#: g10/keyedit.c:955
+msgid "lsign"
+msgstr "semloc"
+
+#: g10/keyedit.c:955
+msgid "sign the key locally"
+msgstr "semneaz� cheia local"
+
+#: g10/keyedit.c:956
+msgid "nrsign"
+msgstr "semirev"
+
+#: g10/keyedit.c:956
+msgid "sign the key non-revocably"
+msgstr "semneaz� cheia irevocabil"
+
+#: g10/keyedit.c:957
+msgid "nrlsign"
+msgstr "semlirev"
+
+#: g10/keyedit.c:957
+msgid "sign the key locally and non-revocably"
+msgstr "semneaz� cheia local �i irevocabil"
+
+#: g10/keyedit.c:958
+msgid "debug"
+msgstr "depanare"
+
+#: g10/keyedit.c:959
+msgid "adduid"
+msgstr "adauid"
+
+#: g10/keyedit.c:959
+msgid "add a user ID"
+msgstr "adaug� un ID utilizator"
+
+#: g10/keyedit.c:960
+msgid "addphoto"
+msgstr "adapoza"
+
+#: g10/keyedit.c:960
+msgid "add a photo ID"
+msgstr "adaug� o poz� ID"
+
+#: g10/keyedit.c:961
+msgid "deluid"
+msgstr "steuid"
+
+#: g10/keyedit.c:961
+msgid "delete user ID"
+msgstr "�terge ID utilizator"
+
+#. delphoto is really deluid in disguise
+#: g10/keyedit.c:963
+msgid "delphoto"
+msgstr "stepoza"
+
+#: g10/keyedit.c:964
+msgid "addkey"
+msgstr "adacheie"
+
+#: g10/keyedit.c:964
+msgid "add a secondary key"
+msgstr "adaug� o cheie secundar�"
+
+#: g10/keyedit.c:965
+msgid "delkey"
+msgstr "stecheie"
+
+#: g10/keyedit.c:965
+msgid "delete a secondary key"
+msgstr "�terge o cheie secundar�"
+
+#: g10/keyedit.c:966
+msgid "addrevoker"
+msgstr "adarev"
+
+#: g10/keyedit.c:966
+msgid "add a revocation key"
+msgstr "adaug� o cheie de revocare"
+
+#: g10/keyedit.c:967
+msgid "delsig"
+msgstr "stesem"
+
+#: g10/keyedit.c:967
+msgid "delete signatures"
+msgstr "�terge semn�turi"
+
+#: g10/keyedit.c:968
+msgid "expire"
+msgstr "expira"
+
+#: g10/keyedit.c:968
+msgid "change the expire date"
+msgstr "schimb� data de expirare"
+
+#: g10/keyedit.c:969
+msgid "primary"
+msgstr "primar"
+
+#: g10/keyedit.c:969
+msgid "flag user ID as primary"
+msgstr "marcheaz� ID-ul utilizator ca primar"
+
+#: g10/keyedit.c:970
+msgid "toggle"
+msgstr "comuta"
+
+#: g10/keyedit.c:970
+msgid "toggle between secret and public key listing"
+msgstr "comut� �ntre listele de chei secrete �i publice"
+
+#: g10/keyedit.c:972
+msgid "t"
+msgstr "t"
+
+#: g10/keyedit.c:973
+msgid "pref"
+msgstr "pref"
+
+#: g10/keyedit.c:973
+msgid "list preferences (expert)"
+msgstr "enumer� preferin�ele (expert)"
+
+#: g10/keyedit.c:974
+msgid "showpref"
+msgstr "afispref"
+
+#: g10/keyedit.c:974
+msgid "list preferences (verbose)"
+msgstr "afi�eaz� preferin�ele (detaliat)"
+
+#: g10/keyedit.c:975
+msgid "setpref"
+msgstr "setpref"
+
+#: g10/keyedit.c:975
+msgid "set preference list"
+msgstr "seteaz� lista de preferin�e"
+
+#: g10/keyedit.c:976
+msgid "updpref"
+msgstr "actpref"
+
+#: g10/keyedit.c:976
+msgid "updated preferences"
+msgstr "preferin�e actualizate"
+
+#: g10/keyedit.c:977
+msgid "passwd"
+msgstr "parola"
+
+#: g10/keyedit.c:977
+msgid "change the passphrase"
+msgstr "schimb� fraza-parol�"
+
+#: g10/keyedit.c:978
+msgid "trust"
+msgstr "incred"
+
+#: g10/keyedit.c:978
+msgid "change the ownertrust"
+msgstr "schimb� �ncrederea pentru proprietar"
+
+#: g10/keyedit.c:979
+msgid "revsig"
+msgstr "revsem"
+
+#: g10/keyedit.c:979
+msgid "revoke signatures"
+msgstr "revoc� semn�turi"
+
+#: g10/keyedit.c:980
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:980
+msgid "revoke a user ID"
+msgstr "revoc� un ID utilizator"
+
+#: g10/keyedit.c:981
+msgid "revkey"
+msgstr "revcheie"
+
+#: g10/keyedit.c:981
+msgid "revoke a secondary key"
+msgstr "revoc� o cheie secundar�"
+
+#: g10/keyedit.c:982
+msgid "disable"
+msgstr "deact"
+
+#: g10/keyedit.c:982
+msgid "disable a key"
+msgstr "deactiveaz� o cheie"
+
+#: g10/keyedit.c:983
+msgid "enable"
+msgstr "activ"
+
+#: g10/keyedit.c:983
+msgid "enable a key"
+msgstr "activeaz� o cheie"
+
+#: g10/keyedit.c:984
+msgid "showphoto"
+msgstr "afispoza"
+
+#: g10/keyedit.c:984
+msgid "show photo ID"
+msgstr "arat� o poz� ID"
+
+#: g10/keyedit.c:1004 g10/delkey.c:119
+msgid "can't do that in batchmode\n"
+msgstr "nu pot face acest lucru �n modul batch\n"
+
+#: g10/keyedit.c:1042
+#, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "eroare la citire keyblock secret `%s': %s\n"
+
+#: g10/keyedit.c:1060
+msgid "Secret key is available.\n"
+msgstr "Cheia secret� este disponibil�.\n"
+
+#: g10/keyedit.c:1091
+msgid "Command> "
+msgstr "Comand�> "
+
+#: g10/keyedit.c:1123
+msgid "Need the secret key to do this.\n"
+msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
+
+#: g10/keyedit.c:1127
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
+
+#: g10/keyedit.c:1176
+msgid "Key is revoked."
+msgstr "Cheia este revocat�."
+
+#: g10/keyedit.c:1195
+msgid "Really sign all user IDs? "
+msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? "
+
+#: g10/keyedit.c:1196
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
+
+#: g10/keyedit.c:1221
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
+
+#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+msgid "You must select at least one user ID.\n"
+msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
+
+#: g10/keyedit.c:1243
+msgid "You can't delete the last user ID!\n"
+msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
+
+#: g10/keyedit.c:1246
+msgid "Really remove all selected user IDs? "
+msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? "
+
+#: g10/keyedit.c:1247
+msgid "Really remove this user ID? "
+msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
+
+#: g10/keyedit.c:1285 g10/keyedit.c:1341
+msgid "You must select at least one key.\n"
+msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
+
+#: g10/keyedit.c:1289
+msgid "Do you really want to delete the selected keys? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? "
+
+#: g10/keyedit.c:1290
+msgid "Do you really want to delete this key? "
+msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? "
+
+#: g10/keyedit.c:1325
+msgid "Really revoke all selected user IDs? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? "
+
+#: g10/keyedit.c:1326
+msgid "Really revoke this user ID? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? "
+
+#: g10/keyedit.c:1345
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? "
+
+#: g10/keyedit.c:1346
+msgid "Do you really want to revoke this key? "
+msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? "
+
+#: g10/keyedit.c:1415
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator selectate? "
+
+#: g10/keyedit.c:1417
+msgid "Really update the preferences? "
+msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? "
+
+#: g10/keyedit.c:1455
+msgid "Save changes? "
+msgstr "Salva�i schimb�rile? "
+
+#: g10/keyedit.c:1458
+msgid "Quit without saving? "
+msgstr "Termina�i f�r� a salva? "
+
+#: g10/keyedit.c:1469
+#, c-format
+msgid "update failed: %s\n"
+msgstr "actualizarea a e�uat: %s\n"
+
+#: g10/keyedit.c:1476
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "actualizarea secretului a e�uat: %s\n"
+
+#: g10/keyedit.c:1483
+msgid "Key not changed so no update needed.\n"
+msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
+
+#: g10/keyedit.c:1495
+msgid "Invalid command  (try \"help\")\n"
+msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
+
+#: g10/keyedit.c:1554
+msgid "Digest: "
+msgstr "Rezumat: "
+
+#: g10/keyedit.c:1606
+msgid "Features: "
+msgstr "Capabilit��i: "
+
+#: g10/keyedit.c:1843
+#, c-format
+msgid "This key may be revoked by %s key "
+msgstr "Aceast� cheie poate fi revocat� de cheia %s "
+
+#: g10/keyedit.c:1847
+msgid " (sensitive)"
+msgstr " (senzitiv)"
+
+#. Note, we use the same format string as in other show
+#. functions to make the translation job easier.
+#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#, c-format
+msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
+msgstr "%s%c %4u%c/%08lX  creat�: %s expir�: %s"
+
+#: g10/keyedit.c:1862
+#, c-format
+msgid " trust: %c/%c"
+msgstr " �ncredere: %c/%c"
+
+#: g10/keyedit.c:1866
+msgid "This key has been disabled"
+msgstr "Aceast� cheie a fost deactivat�"
+
+#: g10/keyedit.c:1895
+#, c-format
+msgid "rev! subkey has been revoked: %s\n"
+msgstr "rev! subcheia a fost revocat�: %s\n"
+
+#: g10/keyedit.c:1898
+msgid "rev- faked revocation found\n"
+msgstr "rev- a fost g�sit� o revocare falsificat�\n"
+
+#: g10/keyedit.c:1900
+#, c-format
+msgid "rev? problem checking revocation: %s\n"
+msgstr "rev? probleme la verificare revoc�rii: %s\n"
+
+#: g10/keyedit.c:1920
+msgid "[revoked] "
+msgstr "[revocat�] "
+
+#: g10/keyedit.c:1922
+msgid "[expired] "
+msgstr "[expirat�] "
+
+#: g10/keyedit.c:1930
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
+
+#: g10/keyedit.c:1938
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
+"corect� dac� nu reporni�i programul.\n"
+
+#: g10/keyedit.c:2095
+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 ""
+"AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
+"         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
+
+#: g10/keyedit.c:2100 g10/keyedit.c:2373
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
+
+#: g10/keyedit.c:2106
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
+
+#: g10/keyedit.c:2241
+msgid "Delete this good signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
+
+#: g10/keyedit.c:2251
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
+
+#: g10/keyedit.c:2255
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
+
+#: g10/keyedit.c:2261
+msgid "Really delete this self-signature? (y/N)"
+msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
+
+#: g10/keyedit.c:2275
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Am �ters %d semn�tur�.\n"
+
+#: g10/keyedit.c:2276
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Am �ters %d semn�turi.\n"
+
+#: g10/keyedit.c:2279
+msgid "Nothing deleted.\n"
+msgstr "Nu am �ters nimic.\n"
+
+#: g10/keyedit.c:2368
+msgid ""
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"         some versions of PGP to reject this key.\n"
+msgstr "AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Ad�ugarea unui revocator          desemnat poate face ca unele versiuni de PGP s� resping� cheia.\n"
+
+#: g10/keyedit.c:2379
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
+
+#: g10/keyedit.c:2402
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
+
+#: g10/keyedit.c:2417
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2427
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
+
+#: g10/keyedit.c:2446
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi anulat�!\n"
+
+#: g10/keyedit.c:2452
+msgid "Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator desemnat? (d/N): "
+
+#: g10/keyedit.c:2517
+msgid "Please remove selections from the secret keys.\n"
+msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
+
+#: g10/keyedit.c:2523
+msgid "Please select at most one secondary key.\n"
+msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
+
+#: g10/keyedit.c:2527
+msgid "Changing expiration time for a secondary key.\n"
+msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
+
+#: g10/keyedit.c:2529
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
+
+#: g10/keyedit.c:2571
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
+
+#: g10/keyedit.c:2587
+msgid "No corresponding signature in secret ring\n"
+msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
+
+#: g10/keyedit.c:2667
+msgid "Please select exactly one user ID.\n"
+msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
+
+#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "auto-semn�turi v3 s�rite pentru ID-ul utilizator \"%s\"\n"
+
+#: g10/keyedit.c:2871
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "Nici un ID utilizator cu indicele %d\n"
+
+#: g10/keyedit.c:2917
+#, c-format
+msgid "No secondary key with index %d\n"
+msgstr "Nici o cheie secundar� cu indicele %d\n"
+
+#: g10/keyedit.c:3031
+msgid "user ID: \""
+msgstr "ID utilizator: \""
+
+#: g10/keyedit.c:3036
+#, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"semnat� cu cheie d-voastr� %08lX la %s\n"
+
+#: g10/keyedit.c:3039
+#, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"semnat� local cu cheie d-voastr� %08lX la %s\n"
+
+#: g10/keyedit.c:3044
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "Aceast� semn�tur� a expirat pe %s.\n"
+
+#: g10/keyedit.c:3048
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
+
+#: g10/keyedit.c:3052
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
+
+#. FIXME: detect duplicates here
+#: g10/keyedit.c:3077
+msgid "You have signed these user IDs:\n"
+msgstr "A�i semnat aceste ID-uri utilizator:\n"
+
+#: g10/keyedit.c:3096
+#, c-format
+msgid "   signed by %08lX at %s%s%s\n"
+msgstr "   semnat� de %08lX la %s%s%s\n"
+
+#: g10/keyedit.c:3104
+#, c-format
+msgid "   revoked by %08lX at %s\n"
+msgstr "   revocat de %08lX la %s\n"
+
+#: g10/keyedit.c:3124
+msgid "You are about to revoke these signatures:\n"
+msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
+
+#: g10/keyedit.c:3134
+#, c-format
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   semnat� de %08lX la %s%s\n"
+
+#: g10/keyedit.c:3136
+msgid " (non-exportable)"
+msgstr " (non-exportabil�)"
+
+#: g10/keyedit.c:3143
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
+
+#: g10/keyedit.c:3173
+msgid "no secret key\n"
+msgstr "nici o cheie secret�\n"
+
+#: g10/keyedit.c:3243
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+
+#. Okay, this is a problem.  The user ID selfsig was
+#. created in the future, so we need to warn the user and
+#. set our revocation timestamp one second after that so
+#. everything comes out clean.
+#: g10/keyedit.c:3260
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
+
+#: g10/keyedit.c:3433
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n"
+
+#: g10/keylist.c:91
+msgid "Critical signature policy: "
+msgstr "Politic� de semn�turi critic�: "
+
+#: g10/keylist.c:93
+msgid "Signature policy: "
+msgstr "Politic� de semn�turi: "
+
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778
+msgid "WARNING: invalid notation data found\n"
+msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
+
+#: g10/keylist.c:127
+msgid "Critical signature notation: "
+msgstr "Notare semn�tur� critic�: "
+
+#: g10/keylist.c:129
+msgid "Signature notation: "
+msgstr "Notare semn�tur�: "
+
+#: g10/keylist.c:136
+msgid "not human readable"
+msgstr "ilizibil"
+
+#: g10/keylist.c:225
+msgid "Keyring"
+msgstr "Inel de chei"
+
+#. of subkey
+#: g10/keylist.c:507 g10/mainproc.c:905
+#, c-format
+msgid " [expires: %s]"
+msgstr " [expir�: %s]"
+
+#: g10/keylist.c:1025
+msgid "Primary key fingerprint:"
+msgstr "Amprent� cheie primar�:"
+
+#: g10/keylist.c:1027
+msgid "     Subkey fingerprint:"
+msgstr "     Amprent� subcheie:"
+
+#: g10/keylist.c:1034
+msgid " Primary key fingerprint:"
+msgstr " Amprent� cheie primar�:"
+
+#: g10/keylist.c:1036
+msgid "      Subkey fingerprint:"
+msgstr "      Amprent� subcheie:"
+
+#. use tty
+#: g10/keylist.c:1040 g10/keylist.c:1044
+msgid "     Key fingerprint ="
+msgstr "     Amprent� cheie ="
+
+#: g10/mainproc.c:248
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
+
+#: g10/mainproc.c:259
+#, c-format
+msgid "invalid symkey algorithm detected (%d)\n"
+msgstr "am detectat un algoritm symkey invalid (%d)\n"
+
+#: g10/mainproc.c:288 g10/encr-data.c:66
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s date cifrate\n"
+
+#: g10/mainproc.c:290 g10/encr-data.c:68
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "cifrat cu un algoritm necunoscut %d\n"
+
+#: g10/mainproc.c:318
+#, c-format
+msgid "public key is %08lX\n"
+msgstr "cheia public� este %08lX\n"
+
+#: g10/mainproc.c:364
+msgid "public key encrypted data: good DEK\n"
+msgstr "date cigrate cu cheie public�: DEK bun\n"
+
+#: g10/mainproc.c:416
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+msgstr "cifrat cu cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s\n"
+
+#: g10/mainproc.c:426
+#, c-format
+msgid "encrypted with %s key, ID %08lX\n"
+msgstr "cifrat cu cheia %s, ID %08lX\n"
+
+#: g10/mainproc.c:440
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "decriptarea cu cheie public� a e�uat: %s\n"
+
+#: g10/mainproc.c:467 g10/mainproc.c:486
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "presupunem date cifrate %s\n"
+
+#: g10/mainproc.c:474
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
+
+#: g10/mainproc.c:504
+msgid "decryption okay\n"
+msgstr "decriptare OK\n"
+
+#: g10/mainproc.c:508
+msgid "WARNING: message was not integrity protected\n"
+msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
+
+#: g10/mainproc.c:511
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
+
+#: g10/mainproc.c:517
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decriptarea a e�uat: %s\n"
+
+#: g10/mainproc.c:536
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
+
+#: g10/mainproc.c:538
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "nume fi�ier original='%.*s'\n"
+
+#: g10/mainproc.c:713
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
+
+#: g10/mainproc.c:781
+msgid "Notation: "
+msgstr "Nota�ie:"
+
+#: g10/mainproc.c:793
+msgid "Policy: "
+msgstr "Politica: "
+
+#: g10/mainproc.c:1248
+msgid "signature verification suppressed\n"
+msgstr "verificare semn�tur� eliminat�\n"
+
+#. plaintext before signatures but no one-pass packets
+#: g10/mainproc.c:1290 g10/mainproc.c:1300
+msgid "can't handle these multiple signatures\n"
+msgstr "nu pot m�nui aceste semn�turi multiple\n"
+
+#: g10/mainproc.c:1311
+#, c-format
+msgid "Signature made %.*s using %s key ID %08lX\n"
+msgstr "Semn�tura a f�cut %.*s folosind cheia %s ID %08lX\n"
+
+#: g10/mainproc.c:1360 g10/mainproc.c:1393
+msgid "BAD signature from \""
+msgstr "Semn�tur� INCORECT� din \""
+
+#: g10/mainproc.c:1361 g10/mainproc.c:1394
+msgid "Expired signature from \""
+msgstr "Semn�tur� expirat� din \""
+
+#: g10/mainproc.c:1362 g10/mainproc.c:1395
+msgid "Good signature from \""
+msgstr "Semn�tur� bun� din \""
+
+#: g10/mainproc.c:1397
+msgid "[uncertain]"
+msgstr "[nesigur]"
+
+#: g10/mainproc.c:1491
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Semn�tur� expirat� %s\n"
+
+#: g10/mainproc.c:1496
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Semn�tura expir� %s\n"
+
+#: g10/mainproc.c:1499
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#: g10/mainproc.c:1500
+msgid "binary"
+msgstr "binar"
+
+#: g10/mainproc.c:1501
+msgid "textmode"
+msgstr "modtext"
+
+#: g10/mainproc.c:1501
+msgid "unknown"
+msgstr "necunoscut"
+
+#: g10/mainproc.c:1521
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Nu pot verifica semn�tura: %s\n"
+
+#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+msgid "not a detached signature\n"
+msgstr "nu o semn�tur� deta�at�\n"
+
+#: g10/mainproc.c:1617
+msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgstr "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
+
+#: g10/mainproc.c:1621
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "semn�tur� standalone de clas� 0x%02x\n"
+
+#: g10/mainproc.c:1678
+msgid "old style (PGP 2.x) signature\n"
+msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
+
+#: g10/mainproc.c:1684
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "pachet root invalid detectat �n proc_tree()\n"
+
+#: g10/misc.c:98
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
+
+#: g10/misc.c:162
+msgid "Experimental algorithms should not be used!\n"
+msgstr "Algoritme experimentale nu ar trebui folosite!\n"
+
+#: g10/misc.c:192
+msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+msgstr "acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul standard!\n"
+
+#: g10/misc.c:300
+msgid "the IDEA cipher plugin is not present\n"
+msgstr "plugin-ul cu cifrul IDEA nu este prezent\n"
+
+#: g10/misc.c:301
+msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr "vede�i http://www.gnupg.org/why-not-idea.html pentru informa�ii suplimentare\n"
+
+#: g10/misc.c:509
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
+
+#: g10/misc.c:513
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+
+#: g10/misc.c:515
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
+
+#: g10/parse-packet.c:120
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
+
+#: g10/parse-packet.c:1069
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpachetul de tip %d are bitul critic setat\n"
+
+#: g10/passphrase.c:455 g10/passphrase.c:502
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+
+#: g10/passphrase.c:463
+msgid "can't set client pid for the agent\n"
+msgstr "nu pot seta pid-ul client pentru agent\n"
+
+#: g10/passphrase.c:471
+msgid "can't get server read FD for the agent\n"
+msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
+
+#: g10/passphrase.c:478
+msgid "can't get server write FD for the agent\n"
+msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
+
+#: g10/passphrase.c:511
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
+
+#: g10/passphrase.c:524
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent versiune protocol %d nu este suportat\n"
+
+#: g10/passphrase.c:545 g10/hkp.c:155
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "nu m� pot conecta la `%s': %s\n"
+
+#: g10/passphrase.c:567
+msgid "communication problem with gpg-agent\n"
+msgstr "probleme de comunicare cu gpg-agent\n"
+
+#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988
+msgid "problem with the agent - disabling agent use\n"
+msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
+
+#: g10/passphrase.c:676 g10/passphrase.c:1094
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr " (ID cheie principal� %08lX)"
+
+#: g10/passphrase.c:686
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %08lX, created %s%s\n"
+msgstr ""
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru utilizator:\n"
+"\"%.*s\"\n"
+"%u-bit cheia %s, ID %08lX, creat� %s%s\n"
+
+#: g10/passphrase.c:708
+msgid "Repeat passphrase\n"
+msgstr "Repeta�i fraza-parol�\n"
+
+#: g10/passphrase.c:710
+msgid "Enter passphrase\n"
+msgstr "Introduce�i fraza-parol�\n"
+
+#: g10/passphrase.c:748
+msgid "passphrase too long\n"
+msgstr "fraz�-parol� prea lung�\n"
+
+#: g10/passphrase.c:761
+msgid "invalid response from agent\n"
+msgstr "r�spuns invalid de la agent\n"
+
+#: g10/passphrase.c:776 g10/passphrase.c:869
+msgid "cancelled by user\n"
+msgstr "anulat� de utilizator\n"
+
+#: g10/passphrase.c:781 g10/passphrase.c:959
+#, c-format
+msgid "problem with the agent: agent returns 0x%lx\n"
+msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
+
+#: g10/passphrase.c:1080
+msgid ""
+"\n"
+"You need a passphrase to unlock the secret key for\n"
+"user: \""
+msgstr ""
+"\n"
+"Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
+"secret� pentru utilizator: \""
+
+#: g10/passphrase.c:1089
+#, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
+msgstr "cheia %2$s de %1$u-bi�i, ID %3$08lX, creat� %4$s"
+
+#: g10/passphrase.c:1141
+msgid "can't query password in batchmode\n"
+msgstr "nu pot cere parola �n modul batch\n"
+
+#: g10/passphrase.c:1145
+msgid "Enter passphrase: "
+msgstr "Introduce�i fraza-parol�: "
+
+#: g10/passphrase.c:1149
+msgid "Repeat passphrase: "
+msgstr "Repeta�i fraza-parol�: "
+
+#: g10/plaintext.c:67
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
+
+#: g10/plaintext.c:108
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "eroare la creearea `%s': %s\n"
+
+#: g10/plaintext.c:339
+msgid "Detached signature.\n"
+msgstr "Semn�tur� deta�at�.\n"
+
+#: g10/plaintext.c:343
+msgid "Please enter name of data file: "
+msgstr "V� rug�m introduce�i numele fi�ierului de date: "
+
+#: g10/plaintext.c:364
+msgid "reading stdin ...\n"
+msgstr "citesc stdin ...\n"
+
+#: g10/plaintext.c:398
+msgid "no signed data\n"
+msgstr "nici o dat� semnat�\n"
+
+#: g10/plaintext.c:406
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "nu pot deschide date semnate `%s'\n"
+
+#: g10/pubkey-enc.c:101
+#, c-format
+msgid "anonymous recipient; trying secret key %08lX ...\n"
+msgstr "destinator anonim; �ncerc cheia secret� %08lX ...\n"
+
+#: g10/pubkey-enc.c:107
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "OK, noi suntem destinatarul anonim.\n"
+
+#: g10/pubkey-enc.c:159
+msgid "old encoding of the DEK is not supported\n"
+msgstr "vechea encodare a lui DEK nu este suportat�\n"
+
+#: g10/pubkey-enc.c:178
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
+
+#: g10/pubkey-enc.c:221
+#, c-format
+msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgstr "NOT�: algoritm cifrare %d nu a fost g�sit �n preferin�e\n"
+
+#: g10/pubkey-enc.c:243
+#, c-format
+msgid "NOTE: secret key %08lX expired at %s\n"
+msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
+
+#: g10/pubkey-enc.c:249
+msgid "NOTE: key has been revoked"
+msgstr "NOT�: cheia a fost revocat�"
+
+#: g10/hkp.c:71
+#, c-format
+msgid "requesting key %08lX from %s\n"
+msgstr "cer cheia %08lX de la %s\n"
+
+#: g10/hkp.c:98
+#, c-format
+msgid "can't get key from keyserver: %s\n"
+msgstr "nu pot ob�ine cheia de la serverul de chei: %s\n"
+
+#: g10/hkp.c:179
+#, c-format
+msgid "error sending to `%s': %s\n"
+msgstr "eroare trimitere la `%s': %s\n"
+
+#: g10/hkp.c:194
+#, c-format
+msgid "success sending to `%s' (status=%u)\n"
+msgstr "succes trimitere la `%s' (stare=%u)\n"
+
+#: g10/hkp.c:197
+#, c-format
+msgid "failed sending to `%s': status=%u\n"
+msgstr "a e�uat trimiterea la `%s': stare=%u\n"
+
+#: g10/hkp.c:369
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr "acest server de chei nu este �n totalitate compatibil cu HKP\n"
+
+#: g10/hkp.c:519
+#, c-format
+msgid "searching for \"%s\" from HKP server %s\n"
+msgstr "caut pentru \"%s\" de pe serverul HKP %s\n"
+
+#: g10/hkp.c:571
+#, c-format
+msgid "can't search keyserver: %s\n"
+msgstr "nu pot c�uta serverul de chei: %s\n"
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "algoritm de protec�ie %d%s nu este suportat\n"
+
+#: g10/seckey-cert.c:233
+msgid "Invalid passphrase; please try again"
+msgstr "Fraz�-parol� invalid�; v� rug�m mai �ncerca�i o dat�"
+
+#: g10/seckey-cert.c:234
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:291
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "AVERTISMENT: Cheie slab� detectat� - v� rug�m schimba�i din nou fraza-parol�.\n"
+
+#: g10/seckey-cert.c:329
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "generez �nvechitul checksum de 16-bit pentru protec�ia cheii secrete\n"
+
+#: g10/sig-check.c:73
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "AVERTISMENT: conflict pentru rezumat semn�tur� �n mesaj\n"
+
+#: g10/sig-check.c:213
+#, c-format
+msgid "key %08lX: this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr "cheie %08lX: aceasta este o cheie ElGamal generat� de PGP care NU este sigur� pentru semn�turi!\n"
+
+#: g10/sig-check.c:222
+#, c-format
+msgid "public key %08lX is %lu second newer than the signature\n"
+msgstr "cheie public� %08lX este mai nou� cu %lu secund� dec�t semn�tura\n"
+
+#: g10/sig-check.c:223
+#, c-format
+msgid "public key %08lX is %lu seconds newer than the signature\n"
+msgstr "cheie public� %08lX este mai nou� cu %lu secunde dec�t semn�tura\n"
+
+#: g10/sig-check.c:232
+#, c-format
+msgid "key %08lX has been created %lu second in future (time warp or clock problem)\n"
+msgstr "cheia %08lX a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu ceasul)\n"
+
+#: g10/sig-check.c:234
+#, c-format
+msgid "key %08lX has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr "cheia %08lX a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu ceasul)\n"
+
+#: g10/sig-check.c:247
+#, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
+msgstr "NOT�: cheia semn�turii %08lX a expirat %s\n"
+
+#: g10/sig-check.c:346
+#, c-format
+msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
+msgstr "presupun semn�tur� incorect� din cheia %08lX datorit� unui bit critic necunoscut\n"
+
+#: g10/sig-check.c:552
+#, c-format
+msgid "key %08lX: no subkey for subkey revocation packet\n"
+msgstr "cheia %08lX: nici o subcheie pentru pachetul de revocare a subcheii\n"
+
+#: g10/sign.c:78
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "nu pot pune date notare �n semn�turi v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:86
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "nu pot pune date notare �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:105
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
+msgstr "AVERTISMENT: nu pot %%-expanda notarea (prea mare).  Folosesc neexpandat.\n"
+
+#: g10/sign.c:134
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "nu pot pune un URL de politic� �n semn�turi v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:142
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "nu pot pune un URL de politic� �n semn�turi de chei v3 (stil PGP 2.x)\n"
+
+#: g10/sign.c:155
+#, c-format
+msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr "AVERTISMENT: nu pot %%-expanda url-ul de politic� (prea mare).  Folosesc neexpandat.\n"
+
+#: g10/sign.c:307
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "verificarea semn�turii create a e�uat: %s\n"
+
+#: g10/sign.c:316
+#, c-format
+msgid "%s signature from: \"%s\"\n"
+msgstr "%s semn�tur� de la: \"%s\"\n"
+
+#: g10/sign.c:465
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
+
+#: g10/sign.c:648
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
+
+#: g10/sign.c:673 g10/sign.c:912
+#, c-format
+msgid "can't create %s: %s\n"
+msgstr "nu pot crea %s: %s\n"
+
+#: g10/sign.c:702
+#, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
+
+#: g10/sign.c:796
+msgid "signing:"
+msgstr "semnare:"
+
+#: g10/sign.c:895
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
+
+#: g10/sign.c:1050
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "va fi folosit� cifrarea %s\n"
+
+#: g10/textfilter.c:134
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "nu pot m�nui linii de text mai lungi de %d caractere\n"
+
+#: g10/textfilter.c:231
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "linii de intrare mai lungi de %d caractere\n"
+
+#: g10/tdbio.c:128 g10/tdbio.c:1406
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
+
+#: g10/tdbio.c:134 g10/tdbio.c:1413
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: scrierea a e�uat (n=%d): %s\n"
+
+#: g10/tdbio.c:244
+msgid "trustdb transaction too large\n"
+msgstr "tranzac�ia trustdb prea mare\n"
+
+#: g10/tdbio.c:468
+#, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: nu pot accesa: %s\n"
+
+#: g10/tdbio.c:483
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directorul nu exist�!\n"
+
+#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554
+#, c-format
+msgid "%s: can't create lock\n"
+msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#: g10/tdbio.c:495 g10/tdbio.c:557
+#, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: nu pot crea �ncuietoare(lock)\n"
+
+#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: nu pot crea: %s\n"
+
+#: g10/tdbio.c:516
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
+
+#: g10/tdbio.c:520
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: a fost creat trustdb invalid\n"
+
+#: g10/tdbio.c:523
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: a fost creat trustdb\n"
+
+#: g10/tdbio.c:563
+msgid "NOTE: trustdb not writable\n"
+msgstr "NOT�: nu poate fi scris �n trustdb\n"
+
+#: g10/tdbio.c:579
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: trustdb invalid\n"
+
+#: g10/tdbio.c:611
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: am e�uat s� creez hashtable: %s\n"
+
+#: g10/tdbio.c:619
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715
+#: g10/tdbio.c:1339 g10/tdbio.c:1366
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: eroare citire �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:648 g10/tdbio.c:694
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
+
+#: g10/tdbio.c:1133
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek a e�uat: %s\n"
+
+#: g10/tdbio.c:1141
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
+
+#: g10/tdbio.c:1162
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: nu e un fi�ier trustdb\n"
+
+#: g10/tdbio.c:1182
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: �nregistrare versiune cu recnum %lu\n"
+
+#: g10/tdbio.c:1187
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: versiune fi�ier invalid� %d\n"
+
+#: g10/tdbio.c:1372
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+
+#: g10/tdbio.c:1380
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: eroare scriere �nregistrare dir: %s\n"
+
+#: g10/tdbio.c:1390
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: eroare setere la zero a �nregistr�rii: %s\n"
+
+#: g10/tdbio.c:1420
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: ad�ugarea unei �nregistr�ri a e�uat: %s\n"
+
+#: g10/tdbio.c:1465
+msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+msgstr "trustdb este corupt�; rula�i \"gpg --fix-trustdb\".\n"
+
+#: g10/trustdb.c:201
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "`%s' nu este un ID-cheie de lungime valid�\n"
+
+#: g10/trustdb.c:236
+#, c-format
+msgid "key %08lX: accepted as trusted key\n"
+msgstr "cheia %08lX: acceptat� ca cheie valid�\n"
+
+#: g10/trustdb.c:274
+#, c-format
+msgid "key %08lX occurs more than once in the trustdb\n"
+msgstr "cheia %08lX apare de mai multe ori �n trustdb\n"
+
+#: g10/trustdb.c:289
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "cheia %08lX: nici o cheie public� pentru cheia de �ncredere - s�rit�\n"
+
+#: g10/trustdb.c:298
+#, c-format
+msgid "key %08lX marked as ultimately trusted\n"
+msgstr "cheia %08lX marcat� ca av�nd �ncredere suprem�\n"
+
+#: g10/trustdb.c:324
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "�nregistrare �ncredere %lu, tip req %d: citirea a e�uat: %s\n"
+
+#: g10/trustdb.c:330
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "�nregistrare �ncredere %lu nu este de tipul cerut %d\n"
+
+#: g10/trustdb.c:345 g10/tdbdump.c:59
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "�nregistrare �ncredere %lu, tip %d: scrierea a e�uat: %s\n"
+
+#: g10/trustdb.c:360 g10/tdbdump.c:217
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sincronizarea a e�uat: %s\n"
+
+#: g10/trustdb.c:460
+msgid "no need for a trustdb check\n"
+msgstr "nu e nevoie de o verificare pentru trustdb\n"
+
+#: g10/trustdb.c:466 g10/trustdb.c:1771
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "urm�toarea verificare pentru trustdb programat� pe %s\n"
+
+#: g10/trustdb.c:819
+msgid "please do a --check-trustdb\n"
+msgstr "v� rug�m face�i un --check-trustdb\n"
+
+#: g10/trustdb.c:823
+msgid "checking the trustdb\n"
+msgstr "verific trustdb\n"
+
+#: g10/trustdb.c:1024
+#, c-format
+msgid "public key %08lX not found: %s\n"
+msgstr "cheia public� %08lX nu a fost g�sit�: %s\n"
+
+#: g10/trustdb.c:1565
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
+
+#: g10/trustdb.c:1619
+msgid "no ultimately trusted keys found\n"
+msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
+
+#: g10/trustdb.c:1637
+#, c-format
+msgid "public key of ultimately trusted key %08lX not found\n"
+msgstr "cheia public� a cheii cu �ncredere suprem� %08lX nu a fost g�sit�\n"
+
+#. This should be valid=%d now, but I'm not changing it so I
+#. don't break the translated strings in the stable branch.
+#. Change it in devel. -dms
+#: g10/trustdb.c:1712
+#, c-format
+msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr "verificare la nivel %d semnat=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#: g10/verify.c:110
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"semn�tura nu a putut fi verificat�.\n"
+"V� rug�m aminti�i-v� c� fi�ierul de semn�tur� (.sig sau .asc)\n"
+"ar trebui s� fie primul dat �n linia de comand�.\n"
+
+#: g10/verify.c:177
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "linia de intrare %u prea lung� sau lipse�te LF\n"
+
+#: g10/skclist.c:129 g10/skclist.c:185
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
+
+#: g10/skclist.c:157
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "s�rit� `%s': duplicat�\n"
+
+#: g10/skclist.c:164 g10/skclist.c:172
+#, c-format
+msgid "skipped `%s': %s\n"
+msgstr "s�rit� `%s': %s\n"
+
+#: g10/skclist.c:168
+msgid "skipped: secret key already present\n"
+msgstr "s�rit�: cheia secret� deja prezent�\n"
+
+#: g10/skclist.c:179
+#, c-format
+msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgstr "s�rit� `%s': aceasta este o cheie ElGamal generat� de PGP care nu e sigur� pentru semn�turi!\n"
+
+#. do not overwrite
+#: g10/openfile.c:84
+#, c-format
+msgid "File `%s' exists. "
+msgstr "Fi�ierul `%s' exist�. "
+
+#: g10/openfile.c:86
+msgid "Overwrite (y/N)? "
+msgstr "Suprascriu (d/N)? "
+
+#: g10/openfile.c:119
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: sufix necunoscut\n"
+
+#: g10/openfile.c:141
+msgid "Enter new filename"
+msgstr "Introduce�i un nou nume-fi�ier"
+
+#: g10/openfile.c:184
+msgid "writing to stdout\n"
+msgstr "scriu la stdout\n"
+
+#: g10/openfile.c:284
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "presupun date semnate �n `%s'\n"
+
+#: g10/openfile.c:352
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "fi�ier de configurare nou `%s' creat\n"
+
+#: g10/openfile.c:354
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
+
+#: g10/openfile.c:383
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: nu pot crea director: %s\n"
+
+#: g10/openfile.c:386
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: director creat\n"
+
+#: g10/encr-data.c:91
+msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "AVERTISMENT: mesajul a fost cifrat cu o cheie slab� din cifrul simetric.\n"
+
+#: g10/encr-data.c:98
+msgid "problem handling encrypted packet\n"
+msgstr "problem� cu m�nuirea pachetului cifrat\n"
+
+#: g10/seskey.c:52
+msgid "weak key created - retrying\n"
+msgstr "cheie slab� creat� - re�ncerc\n"
+
+#: g10/seskey.c:57
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "nu pot evita cheie slab� pentru cifru simetric; am �ncercat %d ori!\n"
+
+#: g10/seskey.c:200
+msgid "DSA requires the use of a 160 bit hash algorithm\n"
+msgstr "DSA necesit� folosirea unui algoritm cu hash de 160 bi�i\n"
+
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
+
+#: g10/delkey.c:126
+msgid "can't do that in batchmode without \"--yes\"\n"
+msgstr "nu se poate face acest lucru �n mod batch f�r� \"--yes\"\n"
+
+#: g10/delkey.c:150
+msgid "Delete this key from the keyring? "
+msgstr "�terge�i aceast� cheie din inelul de chei? "
+
+#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? "
+msgstr "Aceasta este o cheie secret�! - chiar o �terge�i? "
+
+#: g10/delkey.c:168
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: g10/delkey.c:178
+msgid "ownertrust information cleared\n"
+msgstr "informa�ii �ncredere-proprietar cur��ate\n"
+
+#: g10/delkey.c:206
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "exist� o cheie secret� pentru cheia public� \"%s\"!\n"
+
+#: g10/delkey.c:208
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai �nt�i.\n"
+
+#: g10/helptext.c:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"Este sarcina d-voastr� s� atribui�i o valoare aici; aceast� valoare\n"
+"nu va fi niciodat� exportat� pentru o ter�� parte.  Trebuie s�\n"
+"implement�m re�eaua-de-�ncredere; aceasta nu are nimic �n comun cu\n"
+"certificatele-de-re�ea (create implicit)."
+
+#: g10/helptext.c:53
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key.  Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"Pentru a construi Re�eaua-de-�ncredere, GnuPG trebuie s� �tie care chei\n"
+"au nivel de �ncredere suprem - acestea de obicei sunt cheile pentru care\n"
+"ave�i acces la cheia secret�.  R�spunde�i \"da\" pentru a seta\n"
+"aceast� cheie cu nivel de �ncredere suprem\n"
+
+#: g10/helptext.c:60
+msgid "If you want to use this revoked key anyway, answer \"yes\"."
+msgstr "Dac� dori�i oricum s� folosi�i aceast� cheie revocat�, r�spunde�i \"da\"."
+
+#: g10/helptext.c:64
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr "Dac� dori�i oricum s� folosi�i aceast� cheie f�r� �ncredere, r�spunde�i \"da\"."
+
+#: g10/helptext.c:68
+msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgstr "Introduce�i ID-ul utilizator al destinatarului mesajului."
+
+#: g10/helptext.c:72
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+"for signatures.  This is the suggested algorithm because verification of\n"
+"DSA signatures are much faster than those of ElGamal.\n"
+"\n"
+"ElGamal is an algorithm which can be used for signatures and encryption.\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"and a sign+encrypt; actually it is the same, but some parameters must be\n"
+"selected in a special way to create a safe key for signatures: this program\n"
+"does this but other OpenPGP implementations are not required to understand\n"
+"the signature+encryption flavor.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing;\n"
+"this is the reason why the encryption only ElGamal key is not available in\n"
+"this menu."
+msgstr ""
+"Selecta�i algoritmul de folosit.\n"
+"\n"
+"DSA (sau DSS) este algoritmul de semn�tur� digital� care poate fi folosit\n"
+"doar pentru semn�turi.  Acesta este algoritmul sugerat pentru c� verificarea\n"
+"semn�turilor DSA este mult mai rapid� dec�t a celor ElGamal.\n"
+"\n"
+"ElGamal este un algoritm ce poate fi folosit pentru semn�turi �i cifrare.\n"
+"OpenPGP face distinc�ie �ntre cele dou� variante ale acestui algoritm: cel\n"
+"numai pentru cifrare �i cel pentru semnare+cifrare; algoritmul este acela�i\n"
+"dar c��iva parametrii trebuie selecta�i �ntr-un mod special pentru a crea\n"
+"o cheie sigur� pentru semn�turi: acest program face acest lucru, dar alte\n"
+"implement�ri OpenPGP ar putea s� nu �n�eleag� varianta de semnare+cifrare.\n"
+"\n"
+"Prima cheie (primar�) trebuie s� fie �ntotdeauna capabil� de semnare;\n"
+"acesta este motivul pentru care cheia ElGamal nu este disponibil� �n\n"
+"acest meniu."
+
+#: g10/helptext.c:92
+msgid ""
+"Although these keys are defined in RFC2440 they are not suggested\n"
+"because they are not supported by all programs and signatures created\n"
+"with them are quite large and very slow to verify."
+msgstr ""
+"De�� aceste chei sunt definite �n RFC2440 ele nu sunt sugerate pentru\n"
+"c� nu sunt suportate de toate programele �i semn�turile create cu ele\n"
+"sunt destul de lungi �i verificarea lor este foarte lent�."
+
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption.  This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+"�n general nu este o idee bun� s� folosi�i aceea�i cheie �i pentru\n"
+"semnare �i pentru cifrare.  Acest algoritm ar trebui folosit numai\n"
+"�n anumite domenii.  V� rug�m consulta�i mai �nt�i un expert �n domeniu."
+
+#: g10/helptext.c:105
+msgid "Enter the size of the key"
+msgstr "Introduce�i lungimea cheii"
+
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
+msgid "Answer \"yes\" or \"no\""
+msgstr "R�spunde�i \"da\" sau \"nu\""
+
+#: g10/helptext.c:119
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Introduce�i valoarea cerut� precum a ar�tat la prompt.\n"
+"Este posibil s� introduce�i o dat� ISO (AAAA-LL-ZZ) dar nu ve�i\n"
+"ob�ine un r�spuns de eroare bun - �n loc sistemul �ncearc� s�\n"
+"interpreteze valoare dat� ca un interval."
+
+#: g10/helptext.c:131
+msgid "Enter the name of the key holder"
+msgstr "Introduce�i numele de�in�torului cheii"
+
+#: g10/helptext.c:136
+msgid "please enter an optional but highly suggested email address"
+msgstr "v� rug�m introduce�i o adres� de email (op�ional� dar recomandat�)"
+
+#: g10/helptext.c:140
+msgid "Please enter an optional comment"
+msgstr "V� rug�m introduce�i un comentriu op�ional"
+
+#: g10/helptext.c:145
+msgid ""
+"N  to change the name.\n"
+"C  to change the comment.\n"
+"E  to change the email address.\n"
+"O  to continue with key generation.\n"
+"Q  to to quit the key generation."
+msgstr ""
+"N  pentru a schimba numele.\n"
+"C  pentru a schimba comentariul.\n"
+"E  pentru a schimba adresa de email.\n"
+"O  pentru a continua cu generarea cheii.\n"
+"T  pentru a termina generarea cheii."
+
+#: g10/helptext.c:154
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "R�spunde�i \"da\" (sau numai \"d\") dac� sunte�i OK s� genera�i subcheia."
+
+#: g10/helptext.c:162
+msgid ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID.  It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"    key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+"    but you could not, or did not verify the key at all.  This is useful for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+"\n"
+"\"2\" means you did casual verification of the key.  For example, this could\n"
+"    mean that you verified the key fingerprint and checked the user ID on the\n"
+"    key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key.  For example, this could\n"
+"    mean that you verified the key fingerprint with the owner of the key in\n"
+"    person, and that you checked, by means of a hard to forge document with a\n"
+"    photo ID (such as a passport) that the name of the key owner matches the\n"
+"    name in the user ID on the key, and finally that you verified (by exchange\n"
+"    of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"C�nd semna�i un ID utilizator pe o cheie ar trebui s� verifica�i mai �nt�i\n"
+"c� cheia apar�ine persoanei numite �n ID-ul utilizator.  Este util �i altora\n"
+"s� �tie c�t de atent a�i verificat acest lucru.\n"
+"\n"
+"\"0\" �nseamn� c� nu pretinde�i nimic despre c�t de atent a�i verificat cheia\n"
+"\"1\" �nseamn� c� crede�i c� cheia este a persoanei ce pretinde c� este\n"
+"    proprietarul ei, dar n-a�i putut, sau nu a�i verificat deloc cheia.\n"
+"    Aceasta este util� pentru verificare \"persona\", unde semna�i cheia\n"
+"    unui utilizator pseudonim.\n"
+"\n"
+"\"2\" �nseamn� c� a�i f�cut o verificare supericial� a cheii.  De exemplu,\n"
+"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii �i a�i verificat\n"
+"    ID-ul utilizator de pe cheie cu un ID cu poz�.\n"
+"\n"
+"\"3\" �nseamn� c� a�i f�cut o verificare extensiv� a cheii.  De exemplu,\n"
+"    aceasta ar putea �nsemna c� a�i verificat amprenta cheii cu proprietarul\n"
+"    cheii �n persoan�, c� a�i verificat folosind un document dificil de\n"
+"    falsificat cu poz� (cum ar fi un pa�aport) c� numele proprietarului cheii\n"
+"    este acela�i cu numele ID-ului utilizator al cheii �i c� a�i verificat\n"
+"    (schimb�nd emailuri) c� adresa de email de pe cheie apar�ine proprietarului\n"
+"cheii.\n"
+"\n"
+"De notat c� exemplele date pentru nivelele 2 �i 3 ceva mai sus sunt *numai*\n"
+"exemple. La urma urmei, d-voastr� decide�i ce �nseamn� \"superficial\" �i\n"
+"\"extensiv\" pentru d-voastr� c�nd semna�i alte chei.\n"
+"\n"
+"Dac� nu �ti�i care este r�spunsul, r�spunde�i \"0\"."
+
+#: g10/helptext.c:200
+msgid "Answer \"yes\" is you want to sign ALL the user IDs"
+msgstr "R�spunde�i \"da\" dac� dori�i s� semna�i TOATE ID-urile utilizator"
+
+#: g10/helptext.c:204
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"R�spunde�i \"da\" dac� �ntr-adev�r dori�i s� �terge�i acest ID utilizator.\n"
+"Toate certificatele sunt de asemenea pierdute!"
+
+#: g10/helptext.c:209
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "R�spunde�i \"da\" dac� este OK s� �terge�i subcheia"
+
+#: g10/helptext.c:214
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"Aceasta este o semn�tur� valid� pe cheie; �n mod normal n-ar trebui\n"
+"s� �terge�i aceast� semn�tur� pentru c� aceasta ar putea fi important�la stabilirea conexiunii de �ncredere la cheie sau alt� cheie certificat�\n"
+"de aceast� cheie."
+
+#: g10/helptext.c:219
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key.  You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"Aceast� semn�tur� nu poate fi verificat� pentru c� nu ave�i cheia\n"
+"corespunz�toare.  Ar trebui s� am�na�i �tergerea sa p�n� �ti�i care\n"
+"cheie a fost folosit� pentru c� aceast� cheie de semnare ar putea\n"
+"constitui o conexiune de �ncredere spre o alt� cheie deja certificat�."
+
+#: g10/helptext.c:225
+msgid ""
+"The signature is not valid.  It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"Semn�tura nu este valid�.  Aceasta ar trebui �tears� de pe inelul\n"
+"d-voastr� de chei."
+
+#: g10/helptext.c:229
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature.  Actually\n"
+"GnuPG might not be able to use this key anymore.  So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"Aceasta este o semn�tur� care leag� ID-ul utilizator de cheie.\n"
+"De obicei nu este o idee bun� s� �terge�i o asemenea semn�tur�.\n"
+"De fapt, GnuPG ar putea s� nu mai poat� folosi aceast� cheie.\n"
+"A�a c� face�i acest lucru numai dac� aceast� auto-semn�tur� este\n"
+"dintr-o oarecare cauz� invalid� �i o a doua este disponibil�."
+
+#: g10/helptext.c:237
+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 will be advanced by one second.\n"
+msgstr ""
+"Schimba�i toate preferin�ele ale tuturor ID-urilor utilizator (sau doar\n"
+"cele selectate) conform cu lista curent� de preferin�e.  Timestamp-urile\n"
+"tuturor auto-semn�turilor afectate vor fi avansate cu o secund�.\n"
+
+#: g10/helptext.c:244
+msgid "Please enter the passhrase; this is a secret sentence \n"
+msgstr "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#: g10/helptext.c:250
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "V� rug�m repeta�i ultima fraz�-parol�, pentru a fi sigur(�) ce a�i tastat."
+
+#: g10/helptext.c:254
+msgid "Give the name of the file to which the signature applies"
+msgstr "Da�i numele fi�ierului la care se aplic� semn�tura"
+
+#: g10/helptext.c:259
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "R�spunde�i \"da\" dac� este OK s� suprascrie�i fi�ierul"
+
+#: g10/helptext.c:264
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"V� rug�m introduce�i un nou nume-fi�ier. Dac� doar ap�sa�i RETURN,\n"
+"va fi folosit fi�ierul implicit (ar�tat �n paranteze)."
+
+#: g10/helptext.c:270
+msgid ""
+"You should specify a reason for the certification.  Depending on the\n"
+"context you have the ability to choose from this list:\n"
+"  \"Key has been compromised\"\n"
+"      Use this if you have a reason to believe that unauthorized persons\n"
+"      got access to your secret key.\n"
+"  \"Key is superseded\"\n"
+"      Use this if you have replaced this key with a newer one.\n"
+"  \"Key is no longer used\"\n"
+"      Use this if you have retired this key.\n"
+"  \"User ID is no longer valid\"\n"
+"      Use this to state that the user ID should not longer be used;\n"
+"      this is normally used to mark an email address invalid.\n"
+msgstr ""
+"Ar trebui s� specifica�i un motiv pentru certificare.  �n func�ie de\n"
+"context ave�i posibilitatea s� alege�i din aceast� list�:\n"
+"  \"Cheia a fost compromis�\"\n"
+"      Folosi�i aceast� op�iune dac� ave�i un motiv s� crede�i c� persoane\n"
+"      neautorizate au avut acces la cheia d-voastr� secret�.\n"
+"  \"Cheia este �nlocuit�\"\n"
+"      Folosi�i aceast� op�iune dac� �nlocui�i cheia cu una nou�.\n"
+"  \"Cheia nu mai este folosit�\"\n"
+"      Folosi�i aceast� op�iune dac� pensiona�i cheia.\n"
+"  \"ID-ul utilizator nu mai este valid\"\n"
+"      Folosi�i aceast� op�iune dac� ID-ul utilizator nu mai trebuie folosit;\n"
+"      de obicei folosit� pentru a marca o adres� de email ca invalid�.\n"
+
+#: g10/helptext.c:286
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate.  Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"Dac� dori�i, pute�i introduce un text descriind de ce publica�i acest\n"
+"certificat de revocare.  V� rug�m fi�i concis.\n"
+"O linie goal� termin� textul.\n"
+
+#: g10/helptext.c:301
+msgid "No help available"
+msgstr "Nici un ajutor disponibil"
+
+#: g10/helptext.c:309
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Nici un disponibil disponibil pentru `%s'"
+
+#: g10/keydb.c:185
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "eroare la crearea inelului de chei `%s': %s\n"
+
+#: g10/keydb.c:192
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "inelul de chei `%s' creat\n"
+
+#: g10/keydb.c:582
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
+
+#: g10/keyring.c:1226
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
+
+#: g10/keyring.c:1228
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s este cel neschimbat\n"
+
+#: g10/keyring.c:1229
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s este cel nou\n"
+
+#: g10/keyring.c:1230
+msgid "Please fix this possible security flaw\n"
+msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
+
+#: g10/keyring.c:1350
+#, c-format
+msgid "checking keyring `%s'\n"
+msgstr "verific inelul de chei `%s'\n"
+
+#: g10/keyring.c:1381
+#, c-format
+msgid "%lu keys so far checked (%lu signatures)\n"
+msgstr "%lu chei p�n� acum verificate (%lu semn�turi)\n"
+
+#: g10/keyring.c:1392
+#, c-format
+msgid "%lu keys checked (%lu signatures)\n"
+msgstr "%lu chei verificate (%lu semn�turi)\n"
+
+#: g10/keyring.c:1458
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: inelul de chei creat\n"
+
+#: g10/photoid.c:65
+msgid ""
+"\n"
+"Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key.  If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"Alege�i o imagine pentru a o folosi ca poz� ID.  Imaginea trebuie s� fie un\n"
+"fi�ier JPEG.  Aminti�i-v� c� imaginea este p�strat� �n cheia d-voastr� public�.\n"
+"Dac� folosi�i o imagine foarte larg�, cheia d-voastr� va deveni de asemenea\n"
+"foarte larg�!\n"
+"�ncerca�i s� folosi�i o imagine de aproximativ 240x288 pixeli.\n"
+
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Introduce�i nume-fi�ier JPEG pentru poz� ID: "
+
+#: g10/photoid.c:87
+#, c-format
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "Nu pot deschide poza \"%s\": %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
+
+#: g10/photoid.c:112
+#, c-format
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "\"%s\" nu este un fi�ier JPEG\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Este aceast� poz� corect� (d/N/t)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "nu pot afi�a poza ID!\n"
+
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "nu este suportat� execu�ia nici unui program la distan��\n"
+
+#: g10/exec.c:184
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "nu pot crea directorul `%s': %s\n"
+
+#: g10/exec.c:325
+msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgstr "chemarea programelor externe sunt deactivate datorit� op�iunilor nesigure pentru permisiunile fi�ierului\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr "aceast� platform� necesit� fi�iere temporare c�nd sunt chemate programe externe\n"
+
+#. If we get this far the exec failed.  Clean up and return.
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "nu pot executa %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "eroare de sistem la chemarea programului extern: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "ie�ire nenatural� a programului extern\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "nu pot executa programul extern\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "nu pot citi r�spunsul programului extern: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
+
+#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340
+msgid "never     "
+msgstr "niciodat�     "
+
+#: g10/revoke.c:92
+msgid "key incomplete\n"
+msgstr "cheie incomplet�\n"
+
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:568
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet a e�uat: %s\n"
+
+#: g10/revoke.c:145
+#, c-format
+msgid "key %08lX incomplete\n"
+msgstr "cheie %08lX incomplet�\n"
+
+#: g10/revoke.c:214 g10/revoke.c:433
+msgid "sorry, can't do this in batch mode\n"
+msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
+
+#: g10/revoke.c:281
+msgid "To be revoked by:\n"
+msgstr "Pentru a fi revocat de:\n"
+
+#: g10/revoke.c:293
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
+
+#: g10/revoke.c:297 g10/revoke.c:503
+msgid "Create a revocation certificate for this key? "
+msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
+
+#: g10/revoke.c:310 g10/revoke.c:534
+msgid "ASCII armored output forced.\n"
+msgstr "Ie�ire �n armur� ASCII for�at�.\n"
+
+#: g10/revoke.c:324 g10/revoke.c:548
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet a e�uat: %s\n"
+
+#. and issue a usage notice
+#: g10/revoke.c:387
+msgid "Revocation certificate created.\n"
+msgstr "Certificat de revocare creat.\n"
+
+#: g10/revoke.c:393
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "nici o cheie de revocare g�sit� pentru `%s'\n"
+
+#: g10/revoke.c:447
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "cheia secret� `%s' nu a fost g�sit�: %s\n"
+
+#: g10/revoke.c:485
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "nici o cheie public� corespunz�toare: %s\n"
+
+#: g10/revoke.c:496
+msgid "public key does not match secret key!\n"
+msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
+
+#: g10/revoke.c:519
+msgid "unknown protection algorithm\n"
+msgstr "algoritm de protec�ie necunoscut\n"
+
+#: g10/revoke.c:523
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
+
+#. and issue a usage notice
+#: g10/revoke.c:574
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable.  But have some caution:  The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Certificat de revocare creat.\n"
+"\n"
+"V� rug�m muta�i-l pe un medium pe care �l pute�i ascunde; dac� cineva pune\n"
+"m�na pe acest certificat l-ar putea folosi s� v� fac� cheia inutilizabil�.\n"
+"Este indicat s� tip�ri�i acest certificat �i s�-l p�stra�i undeva sigur, �n\n"
+"caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
+"ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
+
+#: g10/revoke.c:614
+msgid "Please select the reason for the revocation:\n"
+msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
+
+#: g10/revoke.c:624
+msgid "Cancel"
+msgstr "Renun��"
+
+#: g10/revoke.c:626
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
+
+#: g10/revoke.c:667
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
+
+#: g10/revoke.c:695
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Motiv pentru revocare: %s\n"
+
+#: g10/revoke.c:697
+msgid "(No description given)\n"
+msgstr "(Nici o descriere dat�)\n"
+
+#: g10/revoke.c:702
+msgid "Is this okay? "
+msgstr "Este aceasta OK? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List� cu valori de �ncredere atribuite, creat� %s\n"
+"# (Folosi�i \"gpg --import-ownertrust\" pentru a le reface)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "nu pot deschide fi�ierul: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "linie prea lung�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "eroare: `:' lips�\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "eroare: amprent� invalid�\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "eroare: nici o valoare �ncredere pentru proprietar\n"
+
+#. error
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "eroare g�sire �nregistrare �ncredere: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "eroare citire: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 41e75800f..e95e8217c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-28 00:00+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -44,7 +44,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "ukon�i�"
 
@@ -271,62 +271,62 @@ msgstr "... toto je chyba v programe (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "n�jden� chyba v programe ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nem��em ��ta� `%s': %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nem��em zapisova� do `%s': %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -356,6 +356,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -365,7 +370,7 @@ msgstr ""
 "Pros�m �akajte, z�skava sa entropia. Robte zatia� nejak� in� pr�cu\n"
 "aby ste sa nenudili a zv��ite t�m kvalitu entropie.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -373,169 +378,169 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[s�bor]|�ifrova� s�bor"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "len ulo�enie"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[s�bor]|de�ifrova� s�bor"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "podp�sa� k��� bez mo�nosti revok�cie podpisu"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr ""
 "podp�sa� k��� lok�lne a bez mo�nosti\n"
 " revok�cie podpisu"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "vyp�sa� len poradie paketov"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr ""
 "exportova� hodnoty d�veryhodnosti\n"
 " vlastn�ka k���a"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr ""
 "importova� hodnoty d�veryhodnosti\n"
 " vlastn�ka k���a"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "neinterakt�vna aktualiz�cia datab�zy d�very"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "opravi� naru�en� datab�zu d�very"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Dek�dova� ASCII s�bor alebo std. vstup"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Zak�dova� s�bor alebo std. vstup do ASCII"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,213 +550,213 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr ""
 "pou�i� implicitn� k��� ako implicitn�ho\n"
 " adres�ta"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "vyn�ti� podpisy verzie 3"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "nevynucova� podpisy verzie 3"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "vyn�ti� podpisy verzie 4"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "nevynucova� podpisy verzie 4"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "na �ifrovanie v�dy pou�i� MDC"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "na �ifrovanie nikdy nepou�i� MDC"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "pou�ite gpg-agenta"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "prida� tento s�bor k���ov do zoznamu\n"
 " pou��van�ch s�borov k���ov"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "prida� tento s�bor tajn�ch k���ov do zoznamu"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 "|PO��TA�|pou�i tento server k���ov na vyh�ad�vanie\n"
 " k���ov"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|MENO|nastav znakov� sadu termin�lu na MENO"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "��ta� nastavenia zo s�boru"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[s�bor]|zap�� inform�ciu o stave do s�boru"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|k���|�plne d�verova� tomuto k���u"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "emulova� m�d pop�san� v RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "nastav v�etky vlastnosti paketov, �ifier\n"
 " a hashov ako v OpenPGP"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "nastav v�etky vlastnosti paketov, �ifier\n"
 " a hashov ako v PGP 2.x"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|pou�i� m�d hesla N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG pre hesl�"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG pre hesl�"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|pou�i� kompresn� algoritmus N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "zahodi� identifik�tor k���a zo �ifrovan�ch\n"
 " paketov"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Zobrazi� fotografick� ID"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Nezobrazova� fotografick� ID"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr ""
 "Nastavi� pr�kazov� riadok na prehliadanie\n"
 " fotografick�ho ID"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -760,7 +765,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -780,17 +785,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -800,7 +805,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -808,321 +813,361 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "t�to spr�va nemus� by� s %s pou�ite�n�\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompresn� algoritmus mus� by� v rozmedz� %d..%d\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� kontroly; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr ""
+"pou�itie %s nie je v m�de %s dovolen�\n"
+"\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u��vate�a"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u��vate�a"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nemo�no otvori� %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1130,19 +1175,19 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
@@ -1283,7 +1328,7 @@ msgstr ""
 "Nie je priraden� �iadna hodnota d�very k:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                alias \""
 
@@ -1341,7 +1386,7 @@ msgstr " s = presko�i� tento k���\n"
 msgid " q = quit\n"
 msgstr " u = ukon�i�\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
@@ -1599,7 +1644,7 @@ msgstr "   (%d) RSA (len na �ifrovanie)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -1617,7 +1662,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Napriek tomu vytvori�? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -1827,27 +1872,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do po�a meno alebo koment�r nep��te, pros�m, e-mailov� adresu.\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (U)kon�i�? "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Zmeni� (M)eno, (K)oment�r, (E)-mail alebo (P)okra�ova�/(U)kon�i�? "
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1855,16 +1900,16 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1876,7 +1921,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1888,53 +1933,53 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor verejn�ch k���ov (pubring): %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru verejn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "k��� ozna�en� ako absol�tne d�veryhodn�.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1942,12 +1987,12 @@ msgstr ""
 "Tento k��� nem��e by� pou�it� na �ifrovanie. Pre vytvorenie\n"
 "sekund�rneho k���a na tento ��el m��ete pou�i� pr�kaz \"--edit-key\".\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1955,7 +2000,7 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1963,15 +2008,15 @@ msgstr ""
 "k��� bol vytvoren� %lu sekund v bud�cnosti (do�lo k zmene �asu alebo\n"
 "je probl�m so syst�mov�m �asom)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "POZN�MKA: vytvorenie podk���a pre k���e v3 nie je v s�lade s OpenPGP\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
@@ -1990,17 +2035,17 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "v m�de S2K nemo�no pou�i� symetrick� ESK paket\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VAROVANIE: s�bor je pr�zdny\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete �ifrova� len RSA k���om s d�kou 2048 bitov a menej\n"
@@ -2015,12 +2060,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "algoritmus IDEA nemo�no pou�i� na v�etky k���e, pre ktor� �ifrujete.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2033,340 +2078,340 @@ msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "k��� %08lX: nie je vo form�te RFC 2440 - presko�en�\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr "POZN�MKA: N�jden� prim�rny k��� Elgamal - import m��e chv��u trva�\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
@@ -2374,17 +2419,17 @@ msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
@@ -2392,17 +2437,17 @@ msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
@@ -2411,55 +2456,55 @@ msgstr "k��� %08lX: podk��� presko�en�\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
@@ -2514,20 +2559,27 @@ msgstr ""
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "U��vate�sk� ID \"%s\" je revokovan�."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "VAROVANIE: ID u��vate�a \"%s\" nie je podp�san� n�m sam�m\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2536,11 +2588,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2550,13 +2602,13 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2566,54 +2618,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2623,31 +2675,31 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2655,7 +2707,7 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2663,7 +2715,7 @@ msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2671,7 +2723,7 @@ msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2679,7 +2731,7 @@ msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2688,7 +2740,7 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2696,7 +2748,7 @@ msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2704,7 +2756,7 @@ msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2712,7 +2764,7 @@ msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2720,34 +2772,34 @@ msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2755,7 +2807,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2763,493 +2815,493 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "u"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "ulo�i�"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "vyberte sekund�rny k��� N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "vyp�sa� zoznam podpisov"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "podp�sa� k���"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "podp�sa� k��� bez mo�nosti odvola� podpis (non-revocably)"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "podp�sa� k��� lok�lne a bez mo�nosti odvola� podpis (non-revocably)"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "zmaza� identifik�tor u��vate�a"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "prida� sekund�rny k���"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "zmaza� podpisy"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "aktualizova� predvo�by"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revsig"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr "(citliv� inform�cia)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  vytvoren�: %s platnos� do: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! podk��� bol revokovan�: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- n�jden� falo�n� revok�cia\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�m overenia revok�cie: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3257,7 +3309,13 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3266,45 +3324,45 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3313,84 +3371,84 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3399,7 +3457,7 @@ msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3408,56 +3466,56 @@ msgstr ""
 "\"\n"
 "lok�lne podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   podp�san� %08lX v %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
@@ -3466,12 +3524,12 @@ msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3501,34 +3559,34 @@ msgstr "Podpisov� not�cia: "
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
@@ -3640,80 +3698,89 @@ msgid "can't handle these multiple signatures\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Pomoc nie je k dispoz�cii"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "nezn�ma verzia"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -3757,12 +3824,17 @@ msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "t�to spr�va nemus� by� s %s pou�ite�n�\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -3961,8 +4033,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "zlyhalo posielanie na `%s': (status=%u)\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "tento keyserver nie je plne kompatibiln� s HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4059,33 +4131,38 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "k��� %08lX: neexistuje podk��� pre revok�ciu k���a\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "VAROVANIE: nemo�no %%-expandova� not�cie (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4093,22 +4170,22 @@ msgstr ""
 "VAROVANIE: nem��em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
 "neexpandovan�.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis (detach-sign)s k���a vo "
@@ -4125,11 +4202,11 @@ msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
@@ -4333,7 +4410,7 @@ msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@ -4346,22 +4423,22 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
@@ -4369,7 +4446,7 @@ msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, 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 h�bke %d podp�san�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -5132,33 +5209,33 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Je to v poriadku? "
 
@@ -5203,6 +5280,9 @@ msgstr "chyba pri h�adan� z�znamu d�very: %s\n"
 msgid "read error: %s\n"
 msgstr "chyba pri ��tan�: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "tento keyserver nie je plne kompatibiln� s HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr ""
 #~ "Pou�itie tohto algoritmu sa u� neodpor��a - chcete ho aj tak vytvori�? "
diff --git a/po/sv.po b/po/sv.po
index 726d85394..d265677ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
 "PO-Revision-Date: 2003-04-30 18:47+0200\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -60,7 +60,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "avsluta"
 
@@ -288,62 +288,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status p� \"%s\": %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" �r inte �n vanlig fil - ignorerad\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed �r tom\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varning: slumpk�rnan har en felaktig storlek och anv�nds d�rf�r inte\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte l�sa \"%s\": %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -375,6 +375,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr ""
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -382,7 +387,7 @@ msgid ""
 "of the entropy.\n"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -390,163 +395,163 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[filer]|kryptera filer"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "endast symetrisk kryptering"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekryptera filer"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar fr�n den offentliga (publika)nyckelringen"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "signera en nyckel utan m�jlighet till �terkallelse"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "signera en nyckel lokalt utan m�jlighet till �terkallelse"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "generera ett sp�rrcertifikat"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "s�k efter nycklar hos en nyckelserver"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "uppdaterar tillitsdatabasen utan m�nsklig tillsyn"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -556,200 +561,200 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 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:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "anv�nd inte v3-signaturer"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "anv�nd v4-nyckelsignaturer"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "anv�nd inte v4-nyckelsignaturer"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "anv�nd aldrig en MDC f�r kryptering"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr ""
 
 # syftar p� ett anv�ndargr�nsnitt i ett separat program, till exempel gpa
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "anv�nd gpg-agenten"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "visa vilken nyckelring den listade nyckeln h�r till"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[fil]|skriv statusinformation till fil"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|NYCKELID|lita ovillkorligen p� denna nyckel"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ndra inst�llningarna f�r paket, kryptering och kontrollsumma s� att gpg "
 "f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "�ndra inst�llningarna f�r paket, kryptering och kontrollsumma s� att gpg "
 "h�rmar PGP 2.x-beteende"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senmeningsl�get N"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senmeningar"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd krypteringsalgoritmen NAMN f�r l�senmeningar"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd krypteringsalgoritmen NAMN"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Visa fotoidentifikation"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Visa inte fotoidentifikation"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "S�tt komandoraden f�r att visa fotoientifikation"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -757,7 +762,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -777,17 +782,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 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:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -797,7 +802,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -805,176 +810,170 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "VARNING: %s os�ker �gare till %s\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr ""
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" anv�nds inte\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBSERVERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importalternativ %d\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "felaktiga importalternativ\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportalternativ %d\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "felaktiga exportalternativ\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte s�tta exec-s�kv�gen till %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s g�ller ist�llet f�r %s\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, 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:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, 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:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa fr�nkopplade signaturereller klartextsignaturer\n"
 "tillsammans med --pgp2\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "du kan inte b�de signera och kryptera samtidigt tillsammans med --pgp2\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m�ste anv�nda filer (och inte r�r) tillsammans med --pgp2\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "f�r att kryptera meddelanden med --pgp2 kr�vs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "detta meddelande kanske inte kan anv�ndas av %s\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -985,150 +984,190 @@ 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:1919
+#: g10/g10.c:1894
 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:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBSERVERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltig standardv�rde f�r test-niv�; m�ste vara 0, 1, 2 eller 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinst�llningar\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktiga inst�llningar av krypteringsalgoritm\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "felaktiga inst�llningar av checksummealgoritm\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "felaktiga inst�llningar av kompressionsalgoritm\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symetrisk kryptering valts\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key anv�ndaridentitet"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 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/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "misslyckades med att uppdatera hemligheten: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1136,20 +1175,20 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy �r ogiltig\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy �r ogiltig\n"
 
@@ -1294,7 +1333,7 @@ msgstr ""
 "Inget tillitsv�rde tilldelat till:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
@@ -1359,7 +1398,7 @@ msgstr " s = hoppa �ver denna nyckel\n"
 msgid " q = quit\n"
 msgstr " q = avsluta\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Vad v�ljer du? "
 
@@ -1618,7 +1657,7 @@ msgstr "   (%d) RSA (endast kryptering)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signering och kryptering)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
@@ -1634,7 +1673,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Vill du anv�nda nyckeln trots det? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -1844,28 +1883,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1873,16 +1912,16 @@ msgstr ""
 "Du beh�ver en l�senmening f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "l�senmeningen upprepades inte korrekt; f�rs�k igen."
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1893,7 +1932,7 @@ msgstr ""
 "Jag kommer att g�ra det �nd�. Du kan �ndra din l�senmening n�r som helst\n"
 "om du anv�nder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1905,53 +1944,53 @@ 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:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig (publik) nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen offentlig (publik) nyckelring: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av offentliga (publika) nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig (publik) och hemlig nyckel �r skapade och signerade.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "Nyckeln har ultimat f�rtroende (som din egen nyckel).\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1960,13 +1999,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1974,7 +2013,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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1982,15 +2021,15 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte anv�ndas f�r detta kommando\n"
 
@@ -2009,17 +2048,17 @@ msgstr "fel vid skapandet av l�senmening: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "kan inte anv�nda symetriska ESK-paket pga S2K-l�ge\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' �r redan komprimerad\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "du kan endast krypterar till RSA nycklar som �r h�gst 2048 bitar l�nga i --"
@@ -2035,14 +2074,14 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "kan inte anv�nda IDEA-kryptering f�r alla nycklar du krypterar till.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "att kr�va symetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inst�llningar\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2054,345 +2093,345 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte anv�nda %s n�r du �r i %s l�ge\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad f�r: \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - �verhoppad\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Hittade inte anv�ndaridentiteten]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2009
+#: g10/getkey.c:2074
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr ""
 "det finns en hemlig nyckel tillh�rande denna offentliga (publika) nyckel!\"%s"
 "\"!\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel utan offentlig (publik) nyckel - hoppade �ver\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar �ver block av typen %d\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          �verhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      of�r�ndrade: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya sp�rrar av nycklar: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal l�sta hemliga nycklar: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
 
 # eller �r det en skadad HKP-nyckel som reparerats?
-#: g10/import.c:634
+#: g10/import.c:585
 #, fuzzy, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "nyckel %08lX: HKP-skadad undernyckel reparerad\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr ""
 "nyckel %08lX: accepterade anv�ndaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero p� att det saknas en egensignatur\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen offentlig (publik) nyckel: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX: ny nyckel - �verhoppad\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade offentlig (publik) nyckel (\"%s\")\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte l�sa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny anv�ndaridentitet\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
 "�ver\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen f�rvald publik nyckel\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln �r importerad\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: offentlig (publik) nyckel saknas - kan inte sp�rra nyckeln med "
 "sp�rrcertifikatet (revocation certificate)\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt sp�rrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" sp�rrcertifikat importerat\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen f�r offentlig (publik) nyckel st�ds inte (\"%s\")\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, fuzzy, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen f�r offentlig (publik) nyckel st�ds inte\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
@@ -2400,17 +2439,17 @@ msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, fuzzy, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r sp�rr av nyckeln\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig sp�rr av undernyckel\n"
@@ -2418,17 +2457,17 @@ msgstr "nyckel %08lX: ogiltig sp�rr av undernyckel\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort ogiltig sp�rr av undernyckel\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -2437,56 +2476,56 @@ msgstr "nyckel %08lX: hoppade �ver undernyckel\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: sp�rrcertifikat (revocation certificate) p� fel plats - "
 "hoppade �ver\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "nyckel %08lX: felaktigt sp�rrcertifikat (revocation certificate): %s - "
 "hoppade �ver\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %08lX: signatur p� undernyckel p� fel plats - hoppade �ver\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, fuzzy, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: anv�ndaridentitet hittades tv� g�nger - slog ihop\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: H�mtar sp�rrnyckel %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "VARNING: nyckeln %08lX kan ha sp�rrats: Sp�rrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, fuzzy, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: lade till sp�rrcertifikat (revocation certificate)\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, fuzzy, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
@@ -2540,21 +2579,28 @@ msgstr "%d anv�ndaridentiteter utan giltig egensignatur hittades\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 #, fuzzy
 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:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "VARNING: anv�ndar-ID \"%s\" saknar egensignatur.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2563,18 +2609,18 @@ msgstr ""
 "Egensignaturen p� \"%s\"\n"
 "�r en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Will du g�ra om den till en egensignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
@@ -2582,52 +2628,52 @@ msgstr ""
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du �ndra den till en fullst�ndigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Notera: Giltighetstiden f�r denna nyckel har g�tt ut!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid g�r ut vid %s.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden f�r signaturen ska upph�ra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2635,11 +2681,11 @@ msgstr ""
 "Du kan inte g�ra en OpenPGP-signatur p� en PGP 2.x-nyckel n�r du �r i --pgp2-"
 "l�ge\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle g�ra nyckeln oanv�ndbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2648,32 +2694,32 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillh�r\n"
 "personen som n�mns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (standard)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2681,7 +2727,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2689,7 +2735,7 @@ msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2698,7 +2744,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2707,7 +2753,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2716,7 +2762,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2725,7 +2771,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke m�jlig att �terkalla.\n"
 "\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2733,7 +2779,7 @@ msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2741,7 +2787,7 @@ msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2749,34 +2795,34 @@ msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 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:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2784,7 +2830,7 @@ msgstr ""
 "Skriv in den nya l�senmening f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2792,556 +2838,562 @@ msgstr ""
 "Du vill inte ha n�gon l�senmening - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln utan m�jlighet att �terkalla signaturen"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signera nyckeln lokalt och utan m�jlighet att �terkalla signaturen"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "l�gg till bild"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "l�gg till en anv�ndaridentitet med foto"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "ta bort bild"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "Ange sp�rrnyckel"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "l�gg till en sp�rrnyckel"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "prim�r"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "markera anv�ndar-ID:t som prim�rt"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och offentliga (publika) nycklar"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "skriv ut inst�llningar (expertl�ge)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "skriv ut inst�llningar (utf�rligt)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "ange inst�llningslista"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "uppdaterat inst�llningar"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "�ndra l�senmening"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revuid"
 msgstr "revsig"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 #, fuzzy
 msgid "revoke a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "sp�rra en sekund�r nyckel"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "visa bild"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "visa bild-ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "kan inte g�ra detta i batch-l�ge\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fel vid l�sning av hemlig nyckel\"%s\": %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 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:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Nyckeln �r sp�rrad."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando �r inte till�tet n�r du �r i %s-l�ge.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 #, fuzzy
 msgid "Really revoke all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 #, fuzzy
 msgid "Really revoke this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen sp�rra de valda nycklarna? "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen sp�rra denna nyckel? "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 "Vill du verkligen �ndra inst�llningarna f�r alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 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:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "VARNING: Denna nyckel har sp�rrats av sin �gare!\n"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (k�nsligt)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, 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:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "revoked! en undernyckel har sp�rrats: %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- hittade f�rfalskad sp�rr av nyckeln\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problem vid kontroll av sp�rren: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1956
 #, fuzzy
 msgid "[revoked] "
 msgstr "revkey"
 
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1958
 #, fuzzy
 msgid "[expired] "
 msgstr "expire"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange n�gra inst�llningar f�r ett anv�ndar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 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:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 #, 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:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte l�gga till ett bild-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3350,86 +3402,86 @@ msgstr ""
 "VARNING: Detta �r en PGP 2-nyckel. Om du anger en sp�rrnyckel kan denna "
 "nyckel inte anv�ndas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du f�r inte ange en sp�rrnyckel f�r en PGP 2-nyckel.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange ID f�r �nskad sp�rrnyckel"
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
 
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2516
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
 
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2522
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "Du kan inte ange en nyckel som sin egen sp�rrnyckel\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3438,7 +3490,7 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3447,16 +3499,16 @@ msgstr ""
 "\"\n"
 "lokalt signerad med din nyckel %08lX vid %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen sp�rra denna nyckel? "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
@@ -3464,43 +3516,43 @@ msgstr ""
 "signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   sp�rrad av %08lX %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa sp�rrcertifikaten? (j/N)"
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
@@ -3509,12 +3561,12 @@ msgstr "Anv�ndar-ID \"%s\" �r sp�rrat."
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3547,38 +3599,38 @@ msgstr "Notation: "
 msgid "not human readable"
 msgstr "inte m�jlig att l�sa f�r m�nniskor"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Nyckelring"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "           Fingeravtryck:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 #, fuzzy
 msgid "     Key fingerprint ="
 msgstr "           Fingeravtryck:"
@@ -3698,80 +3750,89 @@ msgstr "signaturen verifierades inte\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "Det finns ingen hj�lp tillg�nglig"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Giltighetstiden har upph�rt f�r signatur fr�n \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[os�kert]"
 
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1515
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1520
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1523
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1524
 #, fuzzy
 msgid "binary"
 msgstr "prim�r"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 #, fuzzy
 msgid "unknown"
 msgstr "ok�nd version"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "ingen frikopplad signatur\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -3815,12 +3876,17 @@ msgstr "VARNING: %s �r en f�rlegad flagga\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "anv�nd \"--keyserver-options %s\" ist�llet\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "detta meddelande kanske inte kan anv�ndas av %s\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d f�r offentlig (publik) nyckelhantering\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, 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"
@@ -4021,8 +4087,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades s�nda till \"%s\": status=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "denna nyckelserver �r inte helt kompatibel med HKP\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4123,52 +4189,57 @@ msgstr ""
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r sp�rr av undernyckel\n"
 
-#: g10/sign.c:78
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
+
+#: g10/sign.c:79
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
 
-#: g10/sign.c:86
+#: g10/sign.c:87
 #, fuzzy
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:134
+#: g10/sign.c:135
 #, fuzzy
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 msgstr "Det g�r inte att anv�nda en PGP 2-nyckel som sp�rrnyckel\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr ""
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "f�rs�k att verifiera signaturen misslyckades: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, fuzzy, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" �r en tom fil\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 #, fuzzy
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
@@ -4185,11 +4256,11 @@ msgstr "kan inte skapa %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "OBSERVERA: chifferalgoritmen %d finns inte i inst�llningarna\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
@@ -4395,7 +4466,7 @@ msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "%s: det beh�vs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
@@ -4410,24 +4481,24 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "hittade inte den offentliga (publika) nyckeln %08lX :%s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1627
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "Hittar inte den offentliga (publika) nyckeln tillh�rande den ultimat "
 "betrodda nyckeln %08lX \n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
@@ -4437,7 +4508,7 @@ msgstr ""
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -5208,34 +5279,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:614
+#: g10/revoke.c:615
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Anledning till sp�rren: "
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning till sp�rren: "
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 #, fuzzy
 msgid "Is this okay? "
 msgstr "Vill du anv�nda nyckeln trots det? "
@@ -5284,6 +5355,9 @@ msgstr "%s: fel vid l�sning av katalogpost: %s\n"
 msgid "read error: %s\n"
 msgstr "skal: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "denna nyckelserver �r inte helt kompatibel med HKP\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "Anv�ndanadet av denna algoritm �r f�rlegat - skapa �nd�? "
 
diff --git a/po/tr.po b/po/tr.po
index f4d61c81d..9a022663c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,12 +1,12 @@
 # Turkish translations for GnuPG messages.
 # Copyright (C) 2003 Free Software Foundation, Inc.
-# Nilgün Belma Bugüner <[email protected]>, 2001,..., 2003.
+# Nilgün Belma Bugüner <[email protected]>, 2001, ...,2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2rc2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-04-25 04:28+0200\n"
+"Project-Id-Version: gnupg 1.2.2\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-21 11:08+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -48,9 +48,9 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
-msgstr "çıkış"
+msgstr "quit"
 
 #: util/miscutil.c:336
 msgid "qQ"
@@ -275,62 +275,62 @@ 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:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,7 +359,12 @@ msgstr ""
 #: cipher/md.c:140
 #, c-format
 msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "özümleme algoritması `%s' bu dağıtımda salt-okunurdur\n"
+msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
+
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
 
 #: cipher/rndegd.c:204
 msgid ""
@@ -367,11 +372,10 @@ msgid ""
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
-"Lütfen bekleyin, rastgele baytlar toplanmaya çalışılıyor. Sıkıntınızı\n"
-"giderecekse başka işler yapın, çünkü bu işlem sizin güvenliğinizi\n"
-"arttırmak için yapılıyor.\n"
+"Lütfen bekleyin rasgele baytlar toplanıyor. Bu işlem sırasında başka\n"
+"işlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını sağlayacak.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -379,163 +383,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar şifrelenir"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -545,197 +549,197 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 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:383
+#: g10/g10.c:380
 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:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 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:444
+#: g10/g10.c:446
 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:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 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:456
+#: g10/g10.c:454
 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:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -743,7 +747,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -763,15 +767,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -781,7 +785,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -789,316 +793,350 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "grup tanımı \"%s\" içinde = işareti yok\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin iyeliği\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "UYARI: %s \"%s\" de güvensiz iliştirilen dizin izinleri\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, 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:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 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:1790
+#: g10/g10.c:1775
 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:1796
+#: g10/g10.c:1781
 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:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "bu ileti %s tarafından kullanılamayabilir\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, 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:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 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:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 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:1934
+#: g10/g10.c:1909
 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:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
+
+#: g10/g10.c:2077
 #, 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:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "gizliyi güncelleme başarısız: %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1106,29 +1144,29 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
 #: g10/gpgv.c:68
 msgid "take the keys from this keyring"
-msgstr "anahtarlar, bu anahtar zincirinden alınır"
+msgstr "anahtarlar bu anahtarlıktan alınır"
 
 #: g10/gpgv.c:70
 msgid "make timestamp conflicts only a warning"
-msgstr "zaman damgası çelişkilerinde sadece uyarı verilir"
+msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
 #: g10/gpgv.c:99
 msgid "Usage: gpgv [options] [files] (-h for help)"
@@ -1140,7 +1178,7 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 "Kullanımı: gpg [seçenekler] [dosyalar]\n"
-"Anahtarların güvenceli olduğu bilinmesine rağmen imzaları kontrol eder\n"
+"Bilinen güvenli anahtarlara göre imzaları kontrol eder\n"
 
 #: g10/armor.c:321
 #, c-format
@@ -1259,7 +1297,7 @@ msgstr ""
 "Güven derecesi belirtilmemiş:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                den \""
 
@@ -1317,7 +1355,7 @@ msgstr " a = bu anahtarı atla\n"
 msgid " q = quit\n"
 msgstr " k = çık\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "Kararınız? "
 
@@ -1574,7 +1612,7 @@ msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (imzalamak ve şifrelemek için)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -1592,7 +1630,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "Yine de oluşturulsun mu? "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -1800,29 +1838,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 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:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 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:1340
+#: g10/keygen.c:1342
 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:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1830,18 +1868,18 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 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:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1853,7 +1891,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1866,53 +1904,53 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, 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:2265
+#: g10/keygen.c:2267
 #, 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:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1920,19 +1958,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:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, 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:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1940,16 +1978,16 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 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:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
@@ -1968,17 +2006,17 @@ msgstr "anahtar parolası oluşturulurken hata: %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: UYARI: dosya boş\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
@@ -1994,13 +2032,13 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
@@ -2012,340 +2050,341 @@ msgstr ""
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
+msgstr "UYARI: gizli anahtar %08lX basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 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:186 g10/getkey.c:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %08lX anahtarı --allow-non-selfsigned-uid kullanılarak geçerli "
 "oldu\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
+msgstr ""
+"yardımcı genel anahtar %08lX için bir gizli anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, 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:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "şu ana kadar herşey yolunda giderek %lu anahtar işlenmiş\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
-msgstr "                   indirildi: %lu"
+msgstr "                      alınan: %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr ""
 "BİLGİ: Elgamal birincil anahtarı saptandı - alınması biraz zaman alacak\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "anahtar %08lX: öz-imzalı olmayan kullanıcı kimliği '%s' kabul edildi\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "anahtar %08lX: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "anahtar %08lX: \"%s\" değişmedi\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "%08lX anahtarı: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "anahtar %08lX: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr ""
 "anahtar %08lX: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
@@ -2353,18 +2392,18 @@ msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "anahtar %08lX: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr ""
 "anahtar %08lX: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
@@ -2372,18 +2411,18 @@ msgstr "anahtar %08lX: yardımcı anahtar yürürlükten kaldırması geçersiz\
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %08lX: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
@@ -2392,58 +2431,58 @@ msgstr "anahtar %08lX: yardımcı anahtar atlandı\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %08lX: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %08lX: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "anahtar %08lX: çift kullanıcı kimliği saptandı - katıştırıldı\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr ""
 "UYARI: anahtar %08lX yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %08lX alınıyor\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr ""
 "UYARI: anahtar %08lX yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %08lX mevcut değil.\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "anahtar %08lX: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
@@ -2497,20 +2536,27 @@ msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "UYARI: kullanıcı kimliği \"%s\" öz-imzalı değil.\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2519,27 +2565,27 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
-"süresi dolmuş.\n"
+"kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
-"Süresi dolan imzanızın yenisiyle değiştirilmesini ister misiniz? (E/h) "
+"Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2548,44 +2594,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" zaten %08lX anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "Onu yine de tekrar imzalamak istiyor musunuz? (e/H) "
+msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 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:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2593,11 +2639,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2606,31 +2652,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (öntanımlı)"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, 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:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2638,7 +2684,7 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2646,7 +2692,7 @@ msgstr ""
 "\n"
 "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2654,7 +2700,7 @@ msgstr ""
 "\n"
 "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2662,7 +2708,7 @@ msgstr ""
 "\n"
 "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2670,7 +2716,7 @@ msgstr ""
 "\n"
 "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2678,15 +2724,15 @@ msgstr ""
 "\n"
 "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 "\n"
-"Her şeyiyle bu anahtarı kontol edemedim.\n"
+"Her şeyiyle bu anahtarı kontrol edemedim.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2694,7 +2740,7 @@ msgstr ""
 "\n"
 "Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2702,34 +2748,34 @@ msgstr ""
 "\n"
 "Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "Gerçekten imzalayacak mısınız? "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2737,7 +2783,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2745,496 +2791,494 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
-msgstr "kaydet"
+msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
-msgstr "yardım"
+msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
-msgstr "piz"
+msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
-msgstr "parmak izini göster"
+msgstr "parmak izini gösterir"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
-msgstr "listele"
+msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
-msgstr "anahtarı ve kullanıcı kimliğini göster"
+msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
-msgstr "kullkim"
+msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
-msgstr "anahtar"
+msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
-msgstr "kontrol"
+msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
-msgstr "imzaları listele"
+msgstr "imzaları listeler"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
-msgstr "imzala"
+msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
-msgstr "yimza"
+msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
-msgstr "yksızimza"
+msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
-msgstr "yürürlükten kaldırılamayan imza"
+msgstr "yürürlükten kaldırılamayan imza yapar"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
-msgstr "içyksızimza"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
-msgstr "yürürlükten kaldırılamayan yerel imza"
+msgstr "yürürlükten kaldırılamayan yerel imza yapar"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
-msgstr "hata ayıklama"
+msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
-msgstr "kullkimEkle"
+msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
-msgstr "fotoekle"
+msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
-msgstr "kullkimSil"
+msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
-msgstr "fotosil"
+msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
-msgstr "anhEkle"
+msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
-msgstr "anhSil"
+msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
-msgstr "iptalEkle"
+msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
-msgstr "imzaSil"
+msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
-msgstr "sontarih"
+msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
-msgstr "asıl"
+msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
-msgstr "seçmece"
+msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
-msgstr "önayar"
+msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
-msgstr "tercihgöst"
+msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
-msgstr "tercihyap"
+msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
-msgstr "tercgüncel"
+msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
-msgstr "aparola"
+msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
-msgstr "güvence"
+msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
-msgstr "imzayürkal"
+msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
-msgstr "kulkimsil"
+msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
-msgstr "bir kullanıcı kimliği iptal eder"
+msgstr "bir kullanıcı kimliği yürürlükten kaldırır"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
-msgstr "yürkalanh"
+msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
-msgstr "iptal"
+msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
-msgstr "kullan"
+msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
-msgstr "fotogöst"
+msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, 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:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 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:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 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:1346
+#: g10/keyedit.c:1382
 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:1415
+#: g10/keyedit.c:1451
 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:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr ""
 "Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
+msgstr "%s%c %4u%c/%08lX  üretildi: %s zamanaşımı: %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
-msgstr " güven derecesi: %c/%c"
+msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, 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:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, 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:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "yürkalanh"
+msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "sontarih"
+msgstr "[süresi doldu] "
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3242,7 +3286,13 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3251,45 +3301,45 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 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:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3299,18 +3349,18 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
@@ -3319,75 +3369,73 @@ msgstr ""
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
-"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
-"kullanamazsınız\n"
+"UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
+"       kullanılamaz!\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr ""
-"bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
-"kullanamazsınız\n"
+"bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
+"misiniz? (e/H): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 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:2529
+#: g10/keyedit.c:2599
 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:2571
+#: g10/keyedit.c:2643
 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:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3396,7 +3444,7 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3405,72 +3453,72 @@ msgstr ""
 "\"\n"
 "%08lX anahtarınızla %s de yerel olarak imzalı\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 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:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, 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:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 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:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "Kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
 #. Okay, this is a problem.  The user ID selfsig was
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr ""
@@ -3501,34 +3549,34 @@ msgstr "imza niteleyici: "
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
@@ -3637,80 +3685,89 @@ msgstr "imza doğrulama engellendi\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, 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"
+msgstr ""
+"%.*s imzası, %s anahtarı ve\n"
+"     %08lX kullanıcı kimliği ile yapılmış\n"
+
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "yardım mevcut değil"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "KÖTÜ imza: \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "Kullanım tarihi geçmiş imza: \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
-msgstr "Doğru imza: \""
+msgstr "Kullanıcı kimliği: \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
-msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
+msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
+msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s imza: \"%s\"den\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "asıl"
+msgstr "ikili"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "metinkipi"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "bilinmeyen sürüm"
+msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -3755,12 +3812,17 @@ msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "bu ileti %s tarafından kullanılamayabilir\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -3857,7 +3919,9 @@ msgstr ""
 #: g10/passphrase.c:1089
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "%u bitlik %s anahtarı, kimlik: %08lX, oluşturuldu %s"
+msgstr ""
+"%u bitlik %s anahtarı, %08lX kimliği ile\n"
+"%s tarihinde üretilmiş"
 
 #: g10/passphrase.c:1141
 msgid "can't query password in batchmode\n"
@@ -3959,8 +4023,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "\"%s\" adresine gönderme işlemi başarısız (durum=%u)\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "bu anahtar sunucusu tamamen HKP uyumlu değil\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -4061,39 +4125,35 @@ msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr ""
 "anahtar %08lX: anahtarı yürürlükten kaldıracak yardımcı anahtar paketi yok\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "anahtar %08lX: anahtarı garantilemek için yardımcı anahtar yok\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
-"olarak atanamaz\n"
+msgstr "niteleme verisi v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr ""
-"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
-"olarak atanamaz\n"
+msgstr "niteleme verisi v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: %%-genişletmesi imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr ""
-"bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
-"olarak atanamaz\n"
+msgstr "poliçe URL'si v3 (PGP 2.x tarzı) imzalara konulamaz\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
+msgstr "poliçe URL'si v3 (PGP 2.x tarzı) anahtar imzalarına konulamaz\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
@@ -4101,22 +4161,22 @@ msgstr ""
 "UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s imza: \"%s\"den\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
@@ -4133,13 +4193,15 @@ msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 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"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
+"yapabilirsiniz\n"
 
 #: g10/sign.c:1050
 #, c-format
@@ -4339,35 +4401,34 @@ msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "lütfen bir --check-trustdb yapın\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "%08lX genel anahtarı yok: %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr "son derece güvenli %08lX genel anahtarı yok\n"
+msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "son derece güvenli %08lX genel anahtarı yok\n"
@@ -4375,7 +4436,7 @@ msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
@@ -4945,42 +5006,40 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"Foto kimliğiniz için kullanılacak bir resim. Resim bir JPEG dosya "
-"olmalıdır.\n"
-"Resim genel anahtarınızın içinde saklanacağından büyük bir resim dosyası\n"
-"kullanırsanız, anahtarınız çok büyük olacaktır.\n"
-"Resim yaklaşık olarak 240x288 boyutlarında olursa iyi olur.\n"
+"Foto kimliği olarak kullanılmak üzere bir resim seçiniz. Resim bir JPEG\n"
+"dosyası olmalıdır. Bu resim genel anahtarınızda saklanacağından, çok büyük\n"
+"bir resim kullanırsanız genel anahtarınız da çok büyük olacaktır. Resim\n"
+"boyutlarının 240x288 civarında seçilmesi uygun olacaktır.\n"
 
 #: g10/photoid.c:79
 msgid "Enter JPEG filename for photo ID: "
-msgstr "Foto Kimliğinin JPEG dosya ismini girin: "
+msgstr "Foto kimliği için JPEG dosya ismini giriniz: "
 
 #: g10/photoid.c:87
 #, c-format
 msgid "Unable to open photo \"%s\": %s\n"
-msgstr "Foto \"%s\" açılamıyor: %s\n"
+msgstr "\"%s\" resmi açılamıyor: %s\n"
 
 #: g10/photoid.c:97
 msgid "Are you sure you want to use it (y/N)? "
-msgstr "Onu kullanamak istediğinizden emin misiniz? (e/H) "
+msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
 #: g10/photoid.c:112
 #, c-format
 msgid "\"%s\" is not a JPEG file\n"
-msgstr "\"%s\": bir JPEG dosyası değil\n"
+msgstr "\"%s\" bir JPEG dosyası değil\n"
 
 #: g10/photoid.c:129
 msgid "Is this photo correct (y/N/q)? "
-msgstr "Bu foto doğru mu? (e/H/s)? "
+msgstr "Bu foto doğru mu? (e/H/ç)? "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
+msgstr "foto kimliği gösterilemiyor!\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr "uzaktan program çalıştırma desteği yok\n"
+msgstr "uzaktan uygulama çalıştırılması desteklenmiyor\n"
 
 #: g10/exec.c:184
 #, c-format
@@ -4991,55 +5050,55 @@ msgstr "`%s' dizini oluşturulamıyor: %s\n"
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
-"harici program çağrıları güvensiz seçenekler dosyası izinlerinden dolayı "
-"iptal edildi\n"
+"güvensiz options dosyası yetkilerinden dolayı dış program çağrıları iptal\n"
+"edildi\n"
 
 #: g10/exec.c:355
 msgid "this platform requires temp files when calling external programs\n"
 msgstr ""
-"bu platform harici programları çağırırken geçici dosyalara ihtiyaç duyuyor\n"
+"bu platformda, dış uygulamalar çalıştırılırken geçici dosyalar gerekiyor\n"
 
 #. If we get this far the exec failed.  Clean up and return.
 #: g10/exec.c:432
 #, c-format
 msgid "unable to execute %s \"%s\": %s\n"
-msgstr "%s \"%s\" çalıştırılamıyor: %s\n"
+msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
 
 #: g10/exec.c:513
 #, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "harici program çağrılırken sistem hatası: %s\n"
+msgstr "dış uygulama çalıştırılırken sistem hatası: %s\n"
 
 #: g10/exec.c:524 g10/exec.c:583
 msgid "unnatural exit of external program\n"
-msgstr "harici programın doğal olmayan çıkışı\n"
+msgstr "Dış uygulamamnın doğal olmayan çıkışı\n"
 
 #: g10/exec.c:539
 msgid "unable to execute external program\n"
-msgstr "harici program çalıştırılamadı\n"
+msgstr "dış uygulama çalıştırılamıyor\n"
 
 #: g10/exec.c:548
 #, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "harici programın yanıtı okunamadı: %s\n"
+msgstr "dış uygulamanın yanıtı okunamıyor: %s\n"
 
 #: g10/exec.c:594 g10/exec.c:601
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
-msgstr "UYARI: geçici dosya kaldırılamadı (%s) `%s': %s\n"
+msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 
 #: g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
-msgstr "UYARI: `%s' geçici dizini silinemedi: %s\n"
+msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
 #: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340
 msgid "never     "
-msgstr "asla      "
+msgstr "asla    "
 
 #: g10/revoke.c:92
 msgid "key incomplete\n"
-msgstr "anahtar eksik\n"
+msgstr "anahtarın içi boş\n"
 
 #: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
 #: g10/revoke.c:186 g10/revoke.c:568
@@ -5050,11 +5109,11 @@ msgstr "build_packet başarısız: %s\n"
 #: g10/revoke.c:145
 #, c-format
 msgid "key %08lX incomplete\n"
-msgstr "anahtar %08lX eksik\n"
+msgstr "anahtar %08lX: içi boş\n"
 
 #: g10/revoke.c:214 g10/revoke.c:433
 msgid "sorry, can't do this in batch mode\n"
-msgstr "bu, betik kipinde yapılamaz\n"
+msgstr "pardon, bu betik kipinde yapılamaz\n"
 
 #: g10/revoke.c:281
 msgid "To be revoked by:\n"
@@ -5062,15 +5121,15 @@ msgstr "Yürürlükten kaldıran:\n"
 
 #: g10/revoke.c:293
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(Bu bir duyarlı yürürlükten kadırma anahtarı)\n"
+msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
 #: g10/revoke.c:297 g10/revoke.c:503
 msgid "Create a revocation certificate for this key? "
-msgstr "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
+msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
 #: g10/revoke.c:310 g10/revoke.c:534
 msgid "ASCII armored output forced.\n"
-msgstr "ASCII zırhlı çıktı yapılacak.\n"
+msgstr "ASCII zırhlı çıktı istendi.\n"
 
 #: g10/revoke.c:324 g10/revoke.c:548
 #, c-format
@@ -5080,7 +5139,7 @@ msgstr "make_keysig_packet başarısız: %s\n"
 #. and issue a usage notice
 #: g10/revoke.c:387
 msgid "Revocation certificate created.\n"
-msgstr "Yürürlükten kaldırma sertifikası oluşturuldu.\n"
+msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
 #: g10/revoke.c:393
 #, c-format
@@ -5095,15 +5154,15 @@ msgstr "gizli anahtar `%s' yok: %s\n"
 #: g10/revoke.c:485
 #, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "ilgili genel anahtarı yok: `%s\n"
+msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
 #: g10/revoke.c:496
 msgid "public key does not match secret key!\n"
-msgstr "genel anahtar, gizli anahtarla eşleşmiyor!\n"
+msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
 #: g10/revoke.c:519
 msgid "unknown protection algorithm\n"
-msgstr "bilinmeyen koruma algoritması\n"
+msgstr "bilinmeyen sıkıştırma algoritması\n"
 
 #: g10/revoke.c:523
 msgid "NOTE: This key is not protected!\n"
@@ -5120,42 +5179,42 @@ msgid ""
 "your media become unreadable.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 msgstr ""
-"Yürürlükten kaldırma setifikası oluşturuldu.\n"
+"Yürürlükten kaldırma sertifikası üretildi.\n"
 "\n"
-"Lütfen onu herkesin erişemeyeceği bir ortama taşıyın; Eğer Mallory\n"
-"bu setifikaya erişebilirse onu anahtarınızı kullanışsız yapmakta\n"
-"kullanabilir. Saklama ortamının da bozulabileceği gözönüne alınırsa\n"
-"bu sertifikayı yazdırıp saklamak daha iyi olur. Ama dikkat: Yazdırma\n"
-"sisteminiz gizlilik gerektiren bu bilgiyi herkesin okuyabileceği\n"
-"duruma getirmesin!\n"
-
-#: g10/revoke.c:614
+"Sertifika başkalarının kolayca erişebileceği yerlerde saklanmamalıdır.\n"
+"Aksi takdirde, yürürlükten kaldırma sertifikanız bilginiz dışında\n"
+"yayınlandığında geçerli olan genel anahtarınızın geçersiz hale gelebilir.\n"
+"Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
+"bir kasada da muhafaza edebilirsiniz.\n"
+
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
-msgstr "Lütfen yürürlükten kaldırma sebebini seçiniz:\n"
+msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(%d 'i belki burada seçmek istersiniz)\n"
+msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Bir istemlik açıklama girin ve boş bir satır ile sonlandırın:\n"
+msgstr ""
+"İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
-msgstr "(Açıklama verilmemiş)\n"
+msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "Bu tamam mı? "
 
@@ -5165,8 +5224,8 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Atanmış güvencedeğerleri listesi, oluşturuldu %s\n"
-"# (Onları almak için \"gpg --import-ownertrust\" kullanın)\n"
+"# Atanan güvencedeğerlerinin listesi %s oluşturuldu\n"
+"# (Eski haline getirmek için \"gpg --import-ownertrust\" kullanın\n"
 
 #: g10/tdbdump.c:140
 #, c-format
@@ -5179,7 +5238,7 @@ msgstr "satır çok uzun\n"
 
 #: g10/tdbdump.c:159
 msgid "error: missing colon\n"
-msgstr "hata: iki nokta üstüste eksik\n"
+msgstr "hata: \":\" eksik\n"
 
 #: g10/tdbdump.c:164
 msgid "error: invalid fingerprint\n"
@@ -5187,19 +5246,22 @@ msgstr "hata: parmakizi geçersiz\n"
 
 #: g10/tdbdump.c:168
 msgid "error: no ownertrust value\n"
-msgstr "hata: sahibiningüvencesi değeri yok\n"
+msgstr "hata: hiç sahibiningüvencesi değeri yok\n"
 
 #. error
 #: g10/tdbdump.c:204
 #, c-format
 msgid "error finding trust record: %s\n"
-msgstr "güvence kaydı bulunurken hata: %s\n"
+msgstr "güvence kaydını ararken hata: %s\n"
 
 #: g10/tdbdump.c:208
 #, c-format
 msgid "read error: %s\n"
 msgstr "okuma hatası: %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "bu anahtar sunucusu tamamen HKP uyumlu değil\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 11d1fc15a..b2b1d6274 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,5 +1,6 @@
 # Traditional Chinese(zh-tw) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
 # Jedi <[email protected]>, 2003.
 # 
 # Special thanks to "Autrijus Tang <[email protected]>".
@@ -7,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-05-01 12:00+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +48,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
 msgid "quit"
 msgstr "quit"
 
@@ -274,62 +275,62 @@ msgstr "... �o�O�ӷ岫 (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
 
-#: cipher/random.c:157
+#: cipher/random.c:160
 msgid "no entropy gathering module detected\n"
 msgstr "��������üƻ`���Ҳ�\n"
 
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�L�k�}�� `%s' �G %s\n"
 
-#: cipher/random.c:385
+#: cipher/random.c:388
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�L�k���o�ɮ� `%s' ����T�G %s\n"
 
-#: cipher/random.c:390
+#: cipher/random.c:393
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ���O�@�ӼзǪ��ɮ� �w �w���L\n"
 
-#: cipher/random.c:395
+#: cipher/random.c:398
 msgid "note: random_seed file is empty\n"
 msgstr "�Ъ`�N�G random_seed �ɮ׬O�Ū�\n"
 
-#: cipher/random.c:401
+#: cipher/random.c:404
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ĵ�i�G random_seed �ɮפj�p�L�� �w �����ĥ�\n"
 
-#: cipher/random.c:409
+#: cipher/random.c:412
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�L�kŪ�� `%s' �G %s\n"
 
-#: cipher/random.c:447
+#: cipher/random.c:450
 msgid "note: random_seed file not updated\n"
 msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
 
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�L�k�إ� `%s' �G %s\n"
 
-#: cipher/random.c:474
+#: cipher/random.c:477
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�L�k�g�J `%s' �G %s\n"
 
-#: cipher/random.c:477
+#: cipher/random.c:480
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�L�k���� `%s' �G %s\n"
 
-#: cipher/random.c:723
+#: cipher/random.c:725
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ĵ�i�G���b�ϥΤ��w�����H���Ʀr���;��I�I\n"
 
-#: cipher/random.c:724
+#: cipher/random.c:726
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,6 +360,11 @@ msgstr ""
 msgid "digest algorithm `%s' is read-only in this release\n"
 msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
 
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
+msgstr ""
+
 #: cipher/rndegd.c:204
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
@@ -368,7 +374,7 @@ msgstr ""
 "�еy�ݤ���A�t�Φ��ɥ��b�`���üơC�p�G�p�|ı�o�L�᪺�ܡA\n"
 "�������ǧO���ơA�o�ˤl�Ʀܯ�����üƪ��~���n�C\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:304
 msgid ""
 "@Commands:\n"
 " "
@@ -376,163 +382,163 @@ msgstr ""
 "@���O�G\n"
 " "
 
-#: g10/g10.c:309
+#: g10/g10.c:306
 msgid "|[file]|make a signature"
 msgstr "|[�ɮ�]|�إߤ@��ñ��"
 
-#: g10/g10.c:310
+#: g10/g10.c:307
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ɮ�]|�إߤ@������ñ��"
 
-#: g10/g10.c:311
+#: g10/g10.c:308
 msgid "make a detached signature"
 msgstr "�إߤ@��������ñ��"
 
-#: g10/g10.c:312
+#: g10/g10.c:309
 msgid "encrypt data"
 msgstr "�[�K���"
 
-#: g10/g10.c:313
+#: g10/g10.c:310
 msgid "|[files]|encrypt files"
 msgstr "|[�ɮ�]|�[�K�ɮ�"
 
-#: g10/g10.c:314
+#: g10/g10.c:311
 msgid "encryption only with symmetric cipher"
 msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
 
-#: g10/g10.c:315
+#: g10/g10.c:312
 msgid "store only"
 msgstr "���x�s"
 
-#: g10/g10.c:316
+#: g10/g10.c:313
 msgid "decrypt data (default)"
 msgstr "��ƸѱK(�w�])"
 
-#: g10/g10.c:317
+#: g10/g10.c:314
 msgid "|[files]|decrypt files"
 msgstr "|[�ɮ�]|�ɮ׸ѱK"
 
-#: g10/g10.c:318
+#: g10/g10.c:315
 msgid "verify a signature"
 msgstr "���ҬY��ñ��"
 
-#: g10/g10.c:320
+#: g10/g10.c:317
 msgid "list keys"
 msgstr "�C�X���_"
 
-#: g10/g10.c:322
+#: g10/g10.c:319
 msgid "list keys and signatures"
 msgstr "�C�X���_�Mñ��"
 
-#: g10/g10.c:323
+#: g10/g10.c:320
 msgid "check key signatures"
 msgstr "�ˬd���_ñ��"
 
-#: g10/g10.c:324
+#: g10/g10.c:321
 msgid "list keys and fingerprints"
 msgstr "�C�X���_�M����"
 
-#: g10/g10.c:325
+#: g10/g10.c:322
 msgid "list secret keys"
 msgstr "�C�X�p�_"
 
-#: g10/g10.c:326
+#: g10/g10.c:323
 msgid "generate a new key pair"
 msgstr "���ͤ@���s�����_��"
 
-#: g10/g10.c:327
+#: g10/g10.c:324
 msgid "remove keys from the public keyring"
 msgstr "�q���_�_�Ͱ�̲��h���_"
 
-#: g10/g10.c:329
+#: g10/g10.c:326
 msgid "remove keys from the secret keyring"
 msgstr "�q�p�_�_�Ͱ�̲��h���_"
 
-#: g10/g10.c:330
+#: g10/g10.c:327
 msgid "sign a key"
 msgstr "ñ�p�Y����_"
 
-#: g10/g10.c:331
+#: g10/g10.c:328
 msgid "sign a key locally"
 msgstr "�Ȧb���añ�p�Y����_"
 
-#: g10/g10.c:332
+#: g10/g10.c:329
 msgid "sign a key non-revocably"
 msgstr "�H���i�M�P�Ҧ���ñ�p�Y����_"
 
-#: g10/g10.c:333
+#: g10/g10.c:330
 msgid "sign a key locally and non-revocably"
 msgstr "�Ȧb���a�H���i�M�P�Ҧ���ñ�p�Y����_"
 
-#: g10/g10.c:334
+#: g10/g10.c:331
 msgid "sign or edit a key"
 msgstr "ñ�p�νs��Y����_"
 
-#: g10/g10.c:335
+#: g10/g10.c:332
 msgid "generate a revocation certificate"
 msgstr "���ͤ@���M�P����"
 
-#: g10/g10.c:337
+#: g10/g10.c:334
 msgid "export keys"
 msgstr "�ץX���_"
 
-#: g10/g10.c:338
+#: g10/g10.c:335
 msgid "export keys to a key server"
 msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
 
-#: g10/g10.c:339
+#: g10/g10.c:336
 msgid "import keys from a key server"
 msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
 
-#: g10/g10.c:341
+#: g10/g10.c:338
 msgid "search for keys on a key server"
 msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
 
-#: g10/g10.c:343
+#: g10/g10.c:340
 msgid "update all keys from a keyserver"
 msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
 
-#: g10/g10.c:347
+#: g10/g10.c:344
 msgid "import/merge keys"
 msgstr "�פJ/�X�֪��_"
 
-#: g10/g10.c:349
+#: g10/g10.c:346
 msgid "list only the sequence of packets"
 msgstr "�ȦC�X�ʥ]�ǦC"
 
-#: g10/g10.c:351
+#: g10/g10.c:348
 msgid "export the ownertrust values"
 msgstr "�ץX�D�[�H����"
 
-#: g10/g10.c:353
+#: g10/g10.c:350
 msgid "import ownertrust values"
 msgstr "�פJ�D�[�H����"
 
-#: g10/g10.c:355
+#: g10/g10.c:352
 msgid "update the trust database"
 msgstr "��s�H����Ʈw"
 
-#: g10/g10.c:357
+#: g10/g10.c:354
 msgid "unattended trust database update"
 msgstr "��s�����[���H����Ʈw"
 
-#: g10/g10.c:358
+#: g10/g10.c:355
 msgid "fix a corrupted trust database"
 msgstr "�״_�Y�Ӥw�l�����H����Ʈw"
 
-#: g10/g10.c:359
+#: g10/g10.c:356
 msgid "De-Armor a file or stdin"
 msgstr "�q�ɮשμзǿ�J�Ѷ}�ʸ�"
 
-#: g10/g10.c:361
+#: g10/g10.c:358
 msgid "En-Armor a file or stdin"
 msgstr "�q�ɮשμзǿ�J�i��ʸ�"
 
-#: g10/g10.c:363
+#: g10/g10.c:360
 msgid "|algo [files]|print message digests"
 msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
 
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -542,195 +548,195 @@ msgstr ""
 "�ﶵ�G\n"
 " "
 
-#: g10/g10.c:369
+#: g10/g10.c:366
 msgid "create ascii armored output"
 msgstr "�إߥH ASCII �ʸ˹L����X"
 
-#: g10/g10.c:371
+#: g10/g10.c:368
 msgid "|NAME|encrypt for NAME"
 msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
 
-#: g10/g10.c:374
+#: g10/g10.c:371
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�W�r|�H�u�W�r�v�אּ�w�]�������"
 
-#: g10/g10.c:376
+#: g10/g10.c:373
 msgid "use the default key as default recipient"
 msgstr "��w�]�����_���@�w�]�������"
 
-#: g10/g10.c:382
+#: g10/g10.c:379
 msgid "use this user-id to sign or decrypt"
 msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
 
-#: g10/g10.c:383
+#: g10/g10.c:380
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
 
-#: g10/g10.c:385
+#: g10/g10.c:382
 msgid "use canonical text mode"
 msgstr "�ϥμзǪ���r�Ҧ�"
 
-#: g10/g10.c:393
+#: g10/g10.c:390
 msgid "use as output file"
 msgstr "���@��X�ɮרӨϥ�"
 
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
 msgid "verbose"
-msgstr "�o��"
+msgstr "�o���Ҧ�"
 
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "�ɶq�w�R��"
 
-#: g10/g10.c:396
+#: g10/g10.c:393
 msgid "don't use the terminal at all"
 msgstr "�������n�ϥβ׺�"
 
-#: g10/g10.c:397
+#: g10/g10.c:394
 msgid "force v3 signatures"
 msgstr "�j���ϥβĤT��ñ��"
 
-#: g10/g10.c:398
+#: g10/g10.c:395
 msgid "do not force v3 signatures"
 msgstr "���n�j���ϥβĤT��ñ��"
 
-#: g10/g10.c:399
+#: g10/g10.c:396
 msgid "force v4 key signatures"
 msgstr "�j���ϥβĥ|�����_ñ��"
 
-#: g10/g10.c:400
+#: g10/g10.c:397
 msgid "do not force v4 key signatures"
 msgstr "���n�j���ϥβĥ|�����_ñ��"
 
-#: g10/g10.c:401
+#: g10/g10.c:398
 msgid "always use a MDC for encryption"
 msgstr "�`�O�� MDC �ӥ[�K"
 
-#: g10/g10.c:403
+#: g10/g10.c:400
 msgid "never use a MDC for encryption"
 msgstr "�û����n�� MDC �ӥ[�K"
 
-#: g10/g10.c:405
+#: g10/g10.c:402
 msgid "do not make any changes"
 msgstr "���n���������"
 
-#: g10/g10.c:406
+#: g10/g10.c:403
 msgid "prompt before overwriting"
 msgstr "�мg�e���߰�"
 
-#: g10/g10.c:407
+#: g10/g10.c:404
 msgid "use the gpg-agent"
 msgstr "�ϥ� gpg-agent �N�z�{��"
 
-#: g10/g10.c:410
+#: g10/g10.c:407
 msgid "batch mode: never ask"
 msgstr "�妸�Ҧ��G�û����߰�"
 
-#: g10/g10.c:411
+#: g10/g10.c:408
 msgid "assume yes on most questions"
 msgstr "���]�j�h�ư��D���^�����u�O�v"
 
-#: g10/g10.c:412
+#: g10/g10.c:409
 msgid "assume no on most questions"
 msgstr "���]�j�h�ư��D���^�����u�_�v"
 
-#: g10/g10.c:413
+#: g10/g10.c:410
 msgid "add this keyring to the list of keyrings"
 msgstr "��o���_�Ͱ�[�i�_�Ͱ�M�椤"
 
-#: g10/g10.c:414
+#: g10/g10.c:411
 msgid "add this secret keyring to the list"
 msgstr "��o�Өp�_�_�Ͱ�[�i�M�椤"
 
-#: g10/g10.c:415
+#: g10/g10.c:412
 msgid "show which keyring a listed key is on"
 msgstr "��ܳQ�C�X�����_�b���@���_�Ͱ�W"
 
-#: g10/g10.c:416
+#: g10/g10.c:413
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�W�r|�ϥΡu�W�r�v���@�w�]�p�_"
 
-#: g10/g10.c:417
+#: g10/g10.c:414
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�D��|�ϥγo�Ӫ��_���A���ӴM����_"
 
-#: g10/g10.c:421
+#: g10/g10.c:418
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�W��|�]�w�׺ݦr�������u�W�١v"
 
-#: g10/g10.c:422
+#: g10/g10.c:419
 msgid "read options from file"
 msgstr "�q�ɮ�Ū���ﶵ"
 
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
 
-#: g10/g10.c:428
+#: g10/g10.c:425
 msgid "|[file]|write status info to file"
 msgstr "|[�ɮ�]|�⪬�A��T�g�J�ɮ�"
 
-#: g10/g10.c:440
+#: g10/g10.c:437
 msgid "|KEYID|ultimately trust this key"
 msgstr "|���_ID|�����H�������_"
 
-#: g10/g10.c:441
+#: g10/g10.c:438
 msgid "|FILE|load extension module FILE"
 msgstr "|�ɮ�|���J�����Ҳ��ɮ�"
 
-#: g10/g10.c:442
+#: g10/g10.c:444
 msgid "emulate the mode described in RFC1991"
 msgstr "�ɶq�ҥ� RFC1991 �̩Ҵy�z���Ҧ�"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 OpenPGP ���A"
 
-#: g10/g10.c:444
+#: g10/g10.c:446
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 PGP 2.x ���A"
 
-#: g10/g10.c:452
+#: g10/g10.c:450
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ϥμҦ� N ���K�X��"
 
-#: g10/g10.c:454
+#: g10/g10.c:452
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|�W��|�K�X��ϥΡu�W�١v�T���K�n�t��k"
 
-#: g10/g10.c:456
+#: g10/g10.c:454
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|�W��|�K�X��ϥΡu�W�١v�s�K�t��k"
 
-#: g10/g10.c:458
+#: g10/g10.c:456
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�W��|�ϥΡu�W�١v�s�K�t��k"
 
-#: g10/g10.c:459
+#: g10/g10.c:457
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�W��|�ϥΡu�W�١v�T���K�n�t��k"
 
-#: g10/g10.c:461
+#: g10/g10.c:459
 msgid "|N|use compress algorithm N"
 msgstr "|N|�ϥ� N ���Y�t��k"
 
-#: g10/g10.c:462
+#: g10/g10.c:460
 msgid "throw keyid field of encrypted packets"
 msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
 
-#: g10/g10.c:463
+#: g10/g10.c:461
 msgid "Show Photo IDs"
 msgstr "��ܷӤ� ID"
 
-#: g10/g10.c:464
+#: g10/g10.c:462
 msgid "Don't show Photo IDs"
 msgstr "����ܷӤ� ID"
 
-#: g10/g10.c:465
+#: g10/g10.c:463
 msgid "Set command line to view Photo IDs"
 msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
 
-#: g10/g10.c:471
+#: g10/g10.c:470
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -738,7 +744,7 @@ msgstr ""
 "@\n"
 "(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
 
-#: g10/g10.c:474
+#: g10/g10.c:473
 msgid ""
 "@\n"
 "Examples:\n"
@@ -758,15 +764,15 @@ msgstr ""
 " --list-keys [�W�r]         ��ܪ��_\n"
 " --fingerprint [�W�r]       ��ܫ���\n"
 
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
 
-#: g10/g10.c:638
+#: g10/g10.c:637
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
 
-#: g10/g10.c:641
+#: g10/g10.c:640
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -776,7 +782,7 @@ msgstr ""
 "ñ�p�B�ˬd�B�[�K�θѱK\n"
 "�w�]���ާ@�|�̿�J��Ʀөw\n"
 
-#: g10/g10.c:652
+#: g10/g10.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -784,333 +790,367 @@ msgstr ""
 "\n"
 "�w�Q�䴩���t��k�G\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:654
 msgid "Pubkey: "
 msgstr "���_�G "
 
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
 msgid "Cipher: "
 msgstr "�s�K�k�G "
 
-#: g10/g10.c:667
+#: g10/g10.c:666
 msgid "Hash: "
 msgstr "����G "
 
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
 msgid "Compression: "
 msgstr "���Y�G "
 
-#: g10/g10.c:756
+#: g10/g10.c:755
 msgid "usage: gpg [options] "
 msgstr "�Ϊk�G gpg [�ﶵ] "
 
-#: g10/g10.c:824
+#: g10/g10.c:823
 msgid "conflicting commands\n"
 msgstr "���O�����٬�\n"
 
-#: g10/g10.c:842
+#: g10/g10.c:841
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
 
-#: g10/g10.c:1010
+#: g10/g10.c:1009
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1013
+#: g10/g10.c:1012
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1015
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1019
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1196
+#: g10/g10.c:1195
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1231
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1235
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�ﶵ�� `%s' �G %s\n"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1242
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�q `%s' Ū���ﶵ\n"
 
-#: g10/g10.c:1429
+#: g10/g10.c:1428
 #, c-format
 msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
 msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1559
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:1587
+#: g10/g10.c:1577
 msgid "could not parse keyserver URI\n"
 msgstr "�L�k���R���_���A�� URI\n"
 
-#: g10/g10.c:1596
+#: g10/g10.c:1586
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1599
+#: g10/g10.c:1589
 msgid "invalid import options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1596
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1599
 msgid "invalid export options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1615
+#: g10/g10.c:1605
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�L�k������ɸ��|�]�� %s\n"
 
-#: g10/g10.c:1742
+#: g10/g10.c:1732
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
 
-#: g10/g10.c:1746
+#: g10/g10.c:1736
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
 
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
 
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ���Q���\�� %s �֥�\n"
 
-#: g10/g10.c:1758
+#: g10/g10.c:1748
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:1784
+#: g10/g10.c:1769
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
 
-#: g10/g10.c:1790
+#: g10/g10.c:1775
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
 
-#: g10/g10.c:1796
+#: g10/g10.c:1781
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
 
-#: g10/g10.c:1809
+#: g10/g10.c:1794
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
 
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
 msgid "selected digest algorithm is invalid\n"
 msgstr "�ҿ諸�K�n�t��k�L��\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1877
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
 
-#: g10/g10.c:1917
+#: g10/g10.c:1892
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
 
-#: g10/g10.c:1919
+#: g10/g10.c:1894
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �@�w�n�j�� 0\n"
 
-#: g10/g10.c:1921
+#: g10/g10.c:1896
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �@�w�n�j�� 1\n"
 
-#: g10/g10.c:1923
+#: g10/g10.c:1898
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
 
-#: g10/g10.c:1926
+#: g10/g10.c:1901
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
 
-#: g10/g10.c:1930
+#: g10/g10.c:1905
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
 
-#: g10/g10.c:1934
+#: g10/g10.c:1909
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "�L�Ī� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
 
-#: g10/g10.c:1940
+#: g10/g10.c:1915
 msgid "invalid default preferences\n"
 msgstr "�L�Ī��w�]���n\n"
 
-#: g10/g10.c:1948
+#: g10/g10.c:1923
 msgid "invalid personal cipher preferences\n"
 msgstr "�L�Ī��ӤH�s�K�k���n\n"
 
-#: g10/g10.c:1952
+#: g10/g10.c:1927
 msgid "invalid personal digest preferences\n"
 msgstr "�L�Ī��ӤH�K�n���n\n"
 
-#: g10/g10.c:1956
+#: g10/g10.c:1931
 msgid "invalid personal compress preferences\n"
 msgstr "�L�Ī��ӤH���Y���n\n"
 
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2077
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/g10.c:2052
+#: g10/g10.c:2087
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
 
-#: g10/g10.c:2062
+#: g10/g10.c:2097
 msgid "--store [filename]"
 msgstr "--store [�ɦW]"
 
-#: g10/g10.c:2069
+#: g10/g10.c:2104
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ɦW]"
 
-#: g10/g10.c:2077
+#: g10/g10.c:2112
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ɦW]"
 
-#: g10/g10.c:2094
+#: g10/g10.c:2129
 msgid "--sign [filename]"
 msgstr "--sign [�ɦW]"
 
-#: g10/g10.c:2107
+#: g10/g10.c:2142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:2121
+#: g10/g10.c:2156
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ɦW]"
 
-#: g10/g10.c:2130
+#: g10/g10.c:2165
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ɦW]"
 
-#: g10/g10.c:2148
+#: g10/g10.c:2183
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ɦW]"
 
-#: g10/g10.c:2159
+#: g10/g10.c:2194
 msgid "--sign-key user-id"
 msgstr "--sign-key �ϥΪ�ID"
 
-#: g10/g10.c:2167
+#: g10/g10.c:2202
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2175
+#: g10/g10.c:2210
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2183
+#: g10/g10.c:2218
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2191
+#: g10/g10.c:2226
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �ϥΪ�ID [���O]"
 
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "�L�k�}�� %s: %s\n"
 
-#: g10/g10.c:2262
+#: g10/g10.c:2297
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
 
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "��s�p�_���ѡG %s\n"
+
+#: g10/g10.c:2402
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2362
+#: g10/g10.c:2410
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2449
+#: g10/g10.c:2497
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�L�Ī� `%s' ����t��k\n"
 
-#: g10/g10.c:2535
+#: g10/g10.c:2583
 msgid "[filename]"
 msgstr "[�ɦW]"
 
-#: g10/g10.c:2539
+#: g10/g10.c:2587
 msgid "Go ahead and type your message ...\n"
-msgstr "�}�l��J�p���T�� ...\n"
+msgstr "�ж}�l��J�p���T�� ...\n"
 
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
 #: g10/verify.c:142
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�L�k�}�� `%s'\n"
 
-#: g10/g10.c:2815
+#: g10/g10.c:2863
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
-msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v����\n"
+msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2872
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
 
-#: g10/g10.c:2832
+#: g10/g10.c:2882
 msgid "a notation value must not use any control characters\n"
 msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
 
-#: g10/g10.c:2869
+#: g10/g10.c:2917
 msgid "the given certification policy URL is invalid\n"
 msgstr "���w�������ҭ�h URL �L��\n"
 
-#: g10/g10.c:2871
+#: g10/g10.c:2919
 msgid "the given signature policy URL is invalid\n"
 msgstr "���w����h URL �L��\n"
 
@@ -1249,7 +1289,7 @@ msgstr ""
 "�U�C���بS���������H���ȡG\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
 msgid "                aka \""
 msgstr "                ��Y \""
 
@@ -1306,7 +1346,7 @@ msgstr " s = ���L�o����_���B�z\n"
 msgid " q = quit\n"
 msgstr " q = �h�X\n"
 
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
 msgid "Your decision? "
 msgstr "�p���M�w�O�ƻ�H "
 
@@ -1558,7 +1598,7 @@ msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
 
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
 msgid "Your selection? "
 msgstr "�p�n����@�ӡH "
 
@@ -1576,7 +1616,7 @@ msgstr ""
 msgid "Create anyway? "
 msgstr "�L�צp���٬O�n�إ߶ܡH "
 
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "�L�Ī���ܡC\n"
 
@@ -1780,27 +1820,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Ф��n��q�l�l��a�}��i�p���u��m�W�ε�����\n"
 
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�ΰh�X(Q)�H "
 
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�νT�w(O)/�h�X(Q)�H "
 
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
 msgid "Please correct the error first\n"
 msgstr "���q�����~\n"
 
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1808,16 +1848,16 @@ msgstr ""
 "�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
 "\n"
 
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
 msgid "passphrase not correctly repeated; try again"
 msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
 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"
@@ -1829,7 +1869,7 @@ msgstr ""
 "�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
 "\n"
 
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
 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"
@@ -1840,53 +1880,53 @@ msgstr ""
 "�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
 "�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
 
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ���_��|�� 1024 �줸�C\n"
 
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
 msgid "Key generation canceled.\n"
 msgstr "�w�������_���͡C\n"
 
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "���b�N���_�g�� `%s'\n"
 
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
 msgid "public and secret key created and signed.\n"
 msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
 
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
 msgid "key marked as ultimately trusted.\n"
 msgstr "���_�w�Q�аO�������H���F�C\n"
 
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
 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"
@@ -1894,32 +1934,32 @@ msgstr ""
 "�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
 "�Ӳ��ͦ��_�צ�C\n"
 
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
 
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
 
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
 
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
 msgid "Really create? "
 msgstr "�u���n�إ߶ܡH "
 
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
 msgid "--output doesn't work for this command\n"
 msgstr "--output �b�o�өR�O���S���@��\n"
 
@@ -1938,17 +1978,17 @@ msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�]���B�� S2K �Ҧ��U�ӵL�k�ϥι�٦� ESK �ʥ]\n"
 
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' �w�g�Q���Y�F\n"
 
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
 
-#: g10/encode.c:416
+#: g10/encode.c:417
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr "�b --pgp2 �Ҧ����A�p���H 2048 �줸�H�U�� RSA ���_�[�K\n"
 
@@ -1962,12 +2002,12 @@ msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "�p���n�Ψӥ[�K���Ҧ����_������ϥ� IDEA �s�K�k�C\n"
 
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
@@ -1977,332 +2017,332 @@ msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
 msgid "you may not use %s while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/encode.c:753
+#: g10/encode.c:748
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s �w�g�[�K���G \"%s\"\n"
 
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2480 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�䤣�� `%s' ���_�G %s\n"
 
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
 
-#: g10/export.c:222
+#: g10/export.c:189
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "���_ %08lX: ���O�@�� rfc2440 ���_ �w �w���L\n"
 
-#: g10/export.c:238
+#: g10/export.c:205
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "���_ %08lX: ���Q�O�@ �w �w���L\n"
 
-#: g10/export.c:246
+#: g10/export.c:213
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "���_ %08lX: PGP 2.x �˦������_ �w �w���L\n"
 
 #. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
 #, c-format
 msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
-msgstr ""
+msgstr "�Чi�G�p�_ %08lX �èS���������@ SK �[�`�ˬd\n"
 
-#: g10/export.c:347
+#: g10/export.c:310
 msgid "WARNING: nothing exported\n"
 msgstr "ĵ�i�G�S���ץX����F��\n"
 
-#: g10/getkey.c:150
+#: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk �֨��̦��Ӧh���� �w �w�T��\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:2521
+#: g10/getkey.c:187 g10/getkey.c:2586
 msgid "[User id not found]"
 msgstr "[�䤣��ϥΪ� ID]"
 
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
 #, c-format
 msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
 
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "���_ \"%s\" ���۹������p�_�I\n"
+msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
 
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
 
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
 
-#: g10/import.c:259
+#: g10/import.c:226
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "���b���L %d ���A���϶�\n"
 
-#: g10/import.c:268
+#: g10/import.c:235
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "�w�� %lu ����_�Q�B�z�F\n"
 
-#: g10/import.c:273
+#: g10/import.c:240
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/import.c:285
+#: g10/import.c:252
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "�`�@�Q�B�z���ƶq�G %lu\n"
 
-#: g10/import.c:287
+#: g10/import.c:254
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �w���L���s���_�G %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:257
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "      �S���ϥΪ̪� ID�G %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:259
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �w�פJ�G %lu"
 
-#: g10/import.c:298
+#: g10/import.c:265
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �����ܪ��G %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:267
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        �s���ϥΪ� ID�G %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:269
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             �s���l�_�G %lu\n"
 
-#: g10/import.c:304
+#: g10/import.c:271
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             �s���G %lu\n"
 
-#: g10/import.c:306
+#: g10/import.c:273
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         �s�����_�M�P�G %lu\n"
 
-#: g10/import.c:308
+#: g10/import.c:275
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "         �QŪ�����p�_�G %lu\n"
 
-#: g10/import.c:310
+#: g10/import.c:277
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "         �w�פJ���p�_�G %lu\n"
 
-#: g10/import.c:312
+#: g10/import.c:279
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "         �����ܪ��p�_�G %lu\n"
 
-#: g10/import.c:314
+#: g10/import.c:281
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             ���Q�פJ�G %lu\n"
 
-#: g10/import.c:599
+#: g10/import.c:550
 msgid ""
 "NOTE: Elgamal primary key detected - this may take some time to import\n"
 msgstr "�`�N�G������ Elgamal �D�_ �w �פJ�o��D�_�i��|�ӤW�@�Ǯɶ�\n"
 
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "���_ %08lX: �S���ϥΪ� ID\n"
 
-#: g10/import.c:634
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: HKP subkey corruption repaired\n"
 msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
 
-#: g10/import.c:649
+#: g10/import.c:600
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '%s'\n"
 msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
 
-#: g10/import.c:656
+#: g10/import.c:607
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "���_ %08lX: �S�����Ī��ϥΪ� ID\n"
 
-#: g10/import.c:658
+#: g10/import.c:609
 msgid "this may be caused by a missing self-signature\n"
 msgstr "�o�i��O�ѩ�򥢦ۧ�ñ���ҾɭP����G\n"
 
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���_ %08lX: �䤣�줽�_�G %s\n"
 
-#: g10/import.c:673
+#: g10/import.c:624
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "���_ %08lX: �s���_ �w �w���L\n"
 
-#: g10/import.c:683
+#: g10/import.c:634
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "�䤣��i�g���_�Ͱ�G %s\n"
 
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "���b�g�� `%s'\n"
 
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�g���_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/import.c:708
+#: g10/import.c:659
 #, c-format
 msgid "key %08lX: public key \"%s\" imported\n"
 msgstr "���_ %08lX: ���_ \"%s\" �w�Q�פJ\n"
 
-#: g10/import.c:730
+#: g10/import.c:681
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���_ %08lX: ��ڭ̪��ƥ����k�X\n"
 
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���_ %08lX: �L�k�w���l�����_�϶��G %s\n"
 
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���_ %08lX: �L�kŪ����l�����_�϶��G %s\n"
 
-#: g10/import.c:785
+#: g10/import.c:736
 #, c-format
 msgid "key %08lX: \"%s\" 1 new user ID\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs���ϥΪ� ID\n"
 
-#: g10/import.c:788
+#: g10/import.c:739
 #, c-format
 msgid "key %08lX: \"%s\" %d new user IDs\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs���ϥΪ� ID\n"
 
-#: g10/import.c:791
+#: g10/import.c:742
 #, c-format
 msgid "key %08lX: \"%s\" 1 new signature\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs��ñ��\n"
 
-#: g10/import.c:794
+#: g10/import.c:745
 #, c-format
 msgid "key %08lX: \"%s\" %d new signatures\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs��ñ��\n"
 
-#: g10/import.c:797
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: \"%s\" 1 new subkey\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs���l�_\n"
 
-#: g10/import.c:800
+#: g10/import.c:751
 #, c-format
 msgid "key %08lX: \"%s\" %d new subkeys\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs���l�_\n"
 
-#: g10/import.c:819
+#: g10/import.c:770
 #, c-format
 msgid "key %08lX: \"%s\" not changed\n"
 msgstr "���_ %08lX: \"%s\" �S���Q����\n"
 
-#: g10/import.c:881
+#: g10/import.c:832
 #, c-format
 msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
 msgstr "���_ %08lX: �p�_�ϥΤF�L�Ī��s�K�k %d �w �w���L\n"
 
-#: g10/import.c:896
+#: g10/import.c:847
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
 
-#: g10/import.c:907
+#: g10/import.c:858
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
 
 #. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���_ %08lX: �w�g�b�p�_�_�Ͱ餤�F\n"
 
-#: g10/import.c:920
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���_ %08lX: �䤣��p�_�G %s\n"
 
-#: g10/import.c:949
+#: g10/import.c:900
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "���_ %08lX: �S�����_ �w �L�k�M�κM�P����\n"
 
-#: g10/import.c:989
+#: g10/import.c:940
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w��^\n"
 
-#: g10/import.c:1021
+#: g10/import.c:972
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate imported\n"
 msgstr "���_ %08lX: \"%s\" �M�P���Ҥw�Q�פJ\n"
 
-#: g10/import.c:1084
+#: g10/import.c:1035
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
 
-#: g10/import.c:1097
+#: g10/import.c:1048
 #, c-format
 msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
 msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
 
-#: g10/import.c:1099
+#: g10/import.c:1050
 #, c-format
 msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
 msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
 
-#: g10/import.c:1114
+#: g10/import.c:1065
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
 
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���_ %08lX: ���Q�䴩�����}���_�t��k\n"
 
-#: g10/import.c:1123
+#: g10/import.c:1074
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���_ %08lX: �L�Ī����a�l�_\n"
@@ -2310,17 +2350,17 @@ msgstr "���_ %08lX: �L�Ī����a�l�_\n"
 #. Delete the last binding
 #. sig since this one is
 #. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
 #, c-format
 msgid "key %08lX: removed multiple subkey binding\n"
 msgstr "���_ %08lX: �h�����a�l�_�w�Q����\n"
 
-#: g10/import.c:1155
+#: g10/import.c:1106
 #, c-format
 msgid "key %08lX: no subkey for key revocation\n"
 msgstr "���_ %08lX: �S���l�_�i�Ѫ��_�M�P\n"
 
-#: g10/import.c:1164
+#: g10/import.c:1115
 #, c-format
 msgid "key %08lX: invalid subkey revocation\n"
 msgstr "���_ %08lX: �L�Ī��l�_�M�P\n"
@@ -2328,17 +2368,17 @@ msgstr "���_ %08lX: �L�Ī��l�_�M�P\n"
 #. Delete the last revocation
 #. sig since this one is
 #. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
 #, c-format
 msgid "key %08lX: removed multiple subkey revocation\n"
 msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1163
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
 
-#: g10/import.c:1235
+#: g10/import.c:1186
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���_ %08lX: �l�_�w���L\n"
@@ -2347,52 +2387,52 @@ msgstr "���_ %08lX: �l�_�w���L\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:1261
+#: g10/import.c:1212
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
 
-#: g10/import.c:1270
+#: g10/import.c:1221
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���_ %08lX: �M�P���Ҧb���~���a�� �w �w���L\n"
 
-#: g10/import.c:1287
+#: g10/import.c:1238
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w���L\n"
 
-#: g10/import.c:1299
+#: g10/import.c:1250
 #, c-format
 msgid "key %08lX: subkey signature in wrong place - skipped\n"
 msgstr "���_ %08lX: �l�_�b���~���a�� �w �w���L\n"
 
-#: g10/import.c:1307
+#: g10/import.c:1258
 #, c-format
 msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
-msgstr "���_ %08lX: �D�w�������� (%02x) �w �w���L\n"
+msgstr "���_ %08lX: �D�w�������� (0x%02X) �w �w���L\n"
 
-#: g10/import.c:1405
+#: g10/import.c:1356
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
 
-#: g10/import.c:1464
+#: g10/import.c:1415
 #, c-format
 msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
 msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G���b���^�M�P���_ %08lX\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1429
 #, c-format
 msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
 msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
 
-#: g10/import.c:1535
+#: g10/import.c:1486
 #, c-format
 msgid "key %08lX: \"%s\" revocation certificate added\n"
 msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
 
-#: g10/import.c:1566
+#: g10/import.c:1517
 #, c-format
 msgid "key %08lX: direct key signature added\n"
 msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
@@ -2446,20 +2486,27 @@ msgstr "������ %d �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
 
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1218
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�p���M�Q�nñ�p���ܡH (y/N) "
 
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1224
 msgid "  Unable to sign.\n"
 msgstr "  �L�kñ�p�C\n"
 
 #: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
 msgstr "ĵ�i�G�ϥΪ� ID \"%s\" ���g�ۧ�ñ�p�C\n"
 
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2468,11 +2515,11 @@ msgstr ""
 "\"%s\" �̪��ۧ�ñ��\n"
 "�O PGP 2.x ���A���C\n"
 
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�p�O�_�Q�n�N���ɯŦ� OpenPGP �ۧ�ñ���H (y/N) "
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2481,13 +2528,13 @@ msgstr ""
 "�p�ثe�b \"%s\" ��ñ��\n"
 "�w�g�L���F�C\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (y/N) "
 
 #. It's a local sig, and we want to make a
 #. exportable sig.
-#: g10/keyedit.c:449
+#: g10/keyedit.c:485
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2496,53 +2543,53 @@ msgstr ""
 "�p�ثe�b \"%s\" ��ñ��\n"
 "�O�@�����a�C\n"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�p�O�_�Q�n��L�ɯŦ��i�H�����ץX��ñ���H (y/N) "
 
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
 #, c-format
 msgid "\"%s\" was already locally signed by key %08lX\n"
 msgstr "\"%s\" �w�g�Q���_ %08lX �b���añ�p�F\n"
 
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
 #, c-format
 msgid "\"%s\" was already signed by key %08lX\n"
 msgstr "\"%s\" �w�g�Q���_ %08lX ñ�p�F\n"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�p���M�Q�n�A��ñ�p���ܡH (y/N) "
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "�S���F��i�H�����_ %08lX ñ�p\n"
 
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
 msgid "This key has expired!"
 msgstr "�o����_�w�g�L���F�I"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�o����_�N�b %s �L���C\n"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�p�Q�n���p��ñ���]�b�P�@�ӮɭԹL���ܡH (Y/n) "
 
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "�p����b --pgp2 �Ҧ��U�A�� PGP 2.x ���_���X OpenPGP ñ���C\n"
 
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�o�|���o����_�b PGP 2.x �Ҧ��U���i�ϥΡC\n"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2551,31 +2598,31 @@ msgstr ""
 "�p���h�ԷV�ˬd���nñ�p�����_�T���ݩ�W�����ӤH���W�r�O�H\n"
 "�p�G�p�����D�o�Ӱ��D�����סA�п�J�u0�v�C\n"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �ڤ��@���C %s\n"
 
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
 msgid " (default)"
 msgstr " (�w�])"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �ڮڥ��S���ˬd�L�C %s\n"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ���H�N�ˬd�L�F�C %s\n"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
 
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2583,7 +2630,7 @@ msgstr ""
 "�p�u���T�w�nñ�p�o����_\n"
 "�Ωp�����_�G \""
 
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
 msgid ""
 "\n"
 "This will be a self-signature.\n"
@@ -2591,7 +2638,7 @@ msgstr ""
 "\n"
 "�o�N�|�O�ۧ�ñ���C\n"
 
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-exportable.\n"
@@ -2599,7 +2646,7 @@ msgstr ""
 "\n"
 "ĵ�i�G�o��ñ�����|�Q�аO�����i�ץX�C\n"
 
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
 msgid ""
 "\n"
 "WARNING: the signature will not be marked as non-revocable.\n"
@@ -2607,7 +2654,7 @@ msgstr ""
 "\n"
 "ĵ�i�G�o��ñ�����|�Q�аO�����i�M�P�C\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2615,7 +2662,7 @@ msgstr ""
 "\n"
 "�o��ñ���|�Q�аO�����i�ץX�C\n"
 
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2623,7 +2670,7 @@ msgstr ""
 "\n"
 "�o��ñ���|�Q�аO�����i�M�P�C\n"
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2631,7 +2678,7 @@ msgstr ""
 "\n"
 "�ڮڥ��S���ˬd�L�o����_�C\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2639,7 +2686,7 @@ msgstr ""
 "\n"
 "���H�N�ˬd�L�o����_�F�C\n"
 
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2647,34 +2694,34 @@ msgstr ""
 "\n"
 "�ګD�`�p�ߦa�ˬd�L�o����_�F�C\n"
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
 msgid "Really sign? "
 msgstr "�u���nñ�p�ܡH "
 
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ñ�p�ɥ��ѤF�G %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
 msgid "This key is not protected.\n"
 msgstr "�o����_�S���Q�O�@�C\n"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�D�_���p�_�����S��k���ΡC\n"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
 msgid "Key is protected.\n"
 msgstr "���_�Q�O�@�F�C\n"
 
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "�L�k�s��o����_�G %s\n"
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2682,7 +2729,7 @@ msgstr ""
 "��J�n���o��p�_���s�K�X��C\n"
 "\n"
 
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2690,493 +2737,491 @@ msgstr ""
 "�p���Q�n�αK�X�� �w �o�j���O�� *�V* �I�l�I\n"
 "\n"
 
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
 msgid "Do you really want to do this? "
 msgstr "�p�u���Q�n�o�򰵶ܡH "
 
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
 msgid "moving a key signature to the correct place\n"
 msgstr "���b����_��ñ���h���쥿�T����m�h\n"
 
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
 msgid "quit this menu"
 msgstr "���}�o�ӿ��"
 
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
 msgid "save and quit"
 msgstr "�x�s�����}"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
 msgid "show this help"
 msgstr "��ܳo���u�W����"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
 msgid "show fingerprint"
 msgstr "��ܫ���"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
 msgid "list key and user IDs"
 msgstr "�C�X���_�M�ϥΪ� ID"
 
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
 msgid "select user ID N"
 msgstr "�ϥΪ� ID ��F N"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
 msgid "select secondary key N"
 msgstr "��ܦ��_ N"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
 msgid "list signatures"
 msgstr "�C�Xñ��"
 
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
 msgid "sign the key"
 msgstr "ñ�p���_"
 
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
 msgid "sign the key locally"
 msgstr "�Ȧb���añ�p���_"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
 msgid "sign the key non-revocably"
 msgstr "�H���i�M�P�Ҧ�ñ�p���_"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
 msgid "sign the key locally and non-revocably"
 msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
 msgid "add a user ID"
 msgstr "�W�[�@�ӨϥΪ� ID"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
 msgid "add a photo ID"
 msgstr "�W�[�@�ӷӤ� ID"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
 msgid "delete user ID"
 msgstr "�R���@�ӨϥΪ� ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
 msgid "add a secondary key"
 msgstr "�W�[�@�⦸�_"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
 msgid "delete a secondary key"
 msgstr "�R���@�⦸�_"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
 msgid "add a revocation key"
 msgstr "�W�[�@��M�P���_"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "delete signatures"
 msgstr "�R��ñ��"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
 msgid "change the expire date"
 msgstr "���ϥδ���"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
 msgid "flag user ID as primary"
 msgstr "��ϥΪ� ID �аO���D�n"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
 msgid "toggle between secret and public key listing"
 msgstr "��p�_�M���_�M��ô�b�@�_"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
 msgid "list preferences (expert)"
 msgstr "�C�X���n (�M�a�Ҧ�)"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
 msgid "list preferences (verbose)"
 msgstr "�C�X���n (�o���Ҧ�)"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
 msgid "set preference list"
 msgstr "�]�w���n�M��"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
 msgid "updated preferences"
 msgstr "��s�L�����n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
 msgid "change the passphrase"
 msgstr "���K�X��"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 msgid "change the ownertrust"
 msgstr "���D�[�H��"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
 msgid "revoke signatures"
 msgstr "�M�Pñ��"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
 msgid "revoke a user ID"
 msgstr "�M�P�@�ӨϥΪ� ID"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
 msgid "revoke a secondary key"
 msgstr "�M�P�@�⦸�_"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
 msgid "disable a key"
 msgstr "�T�Τ@����_"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
 msgid "enable a key"
 msgstr "�ҥΤ@����_"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
 msgid "show photo ID"
 msgstr "��ܷӤ� ID"
 
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "�L�k�b�妸�Ҧ������˰�\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
 msgid "Secret key is available.\n"
 msgstr "�p�_�i�ΡC\n"
 
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
 msgid "Command> "
 msgstr "���O> "
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
 msgid "Need the secret key to do this.\n"
 msgstr "�n���p�_�ׯ�o�򰵡C\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
 msgid "Key is revoked."
 msgstr "���_�w�g�Q�M�P�F�C"
 
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
 msgid "Really sign all user IDs? "
 msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
 
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
 
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
 msgid "You must select at least one user ID.\n"
 msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
 msgid "You can't delete the last user ID!\n"
 msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
 
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
 msgid "Really remove all selected user IDs? "
 msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
 msgid "Really remove this user ID? "
 msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
 msgid "You must select at least one key.\n"
 msgstr "�p�ܤ֥�����ܤ@����_�C\n"
 
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
 msgid "Do you really want to delete the selected keys? "
 msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
 msgid "Do you really want to delete this key? "
 msgstr "�p�u���n�R���o����_�ܡH "
 
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
 msgid "Really revoke all selected user IDs? "
 msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
 msgid "Really revoke this user ID? "
 msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
 msgid "Do you really want to revoke this key? "
 msgstr "�p�u���Q�n�M�P�o����_�ܡH "
 
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
 msgid "Really update the preferences? "
 msgstr "�u���n��s���n�ܡH "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
 msgid "Save changes? "
 msgstr "�n�x�s�ܧ�ܡH "
 
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
 msgid "Quit without saving? "
 msgstr "�n���x�s�����}�ܡH "
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
 #, c-format
 msgid "update failed: %s\n"
 msgstr "��s���ѡG %s\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
 msgid "Key not changed so no update needed.\n"
 msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
 
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
 msgid "Digest: "
 msgstr "�K�n�G "
 
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
 msgid "Features: "
 msgstr "�S�I�G "
 
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�o����_�i��Q %s ���_�M�P�F "
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
 msgid " (sensitive)"
 msgstr " �]���K���^"
 
 #. Note, we use the same format string as in other show
 #. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  �s�y��G %s �ϥδ����G %s"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
 #, c-format
 msgid " trust: %c/%c"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
 msgid "This key has been disabled"
 msgstr "�o����_�w�g�Q�T�ΤF"
 
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
 
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
 msgid "rev- faked revocation found\n"
 msgstr "rev- �o�{�Q���y���M�P\n"
 
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
 
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
 msgid "[revoked] "
-msgstr "revkey"
+msgstr "[�w�M�P]"
 
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
 msgid "[expired] "
-msgstr "expire"
+msgstr "[�w�L��]"
 
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
 
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3184,7 +3229,13 @@ msgstr ""
 "�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
 "���D�p���s����{���C\n"
 
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+msgid ""
+"WARNING: no user ID has been marked as primary.  This command may\n"
+"              cause a different user ID to become the assumed primary.\n"
+msgstr ""
+
+#: g10/keyedit.c:2165
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3193,45 +3244,45 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
 
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
 
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
 
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
 msgid "Nothing deleted.\n"
 msgstr "�S���F��Q�R���C\n"
 
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3240,84 +3291,82 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
 
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
 
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
 
 #. This actually causes no harm (after all, a key that
 #. designates itself as a revoker is the same as a
 #. regular key), but it's easy enough to check.
-#: g10/keyedit.c:2427
+#: g10/keyedit.c:2497
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
 
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
 
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�бq�p�_��������ܡC\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
 msgid "Please select at most one secondary key.\n"
 msgstr "�Цܦh��ܤ@�⦸�_�C\n"
 
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
 
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
 msgid "Changing expiration time for the primary key.\n"
 msgstr "���b�ܧ�D�_���ϥδ����C\n"
 
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
 
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
 msgid "No corresponding signature in secret ring\n"
 msgstr "�b�p�_��̨S���@�P��ñ��\n"
 
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
 msgid "Please select exactly one user ID.\n"
 msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
 
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "���� %d �S���ϥΪ� ID\n"
 
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "���� %d �S�����_\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
 msgid "user ID: \""
 msgstr "�ϥΪ� ID�G \""
 
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
 #, c-format
 msgid ""
 "\"\n"
@@ -3326,7 +3375,7 @@ msgstr ""
 "\"\n"
 "�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
 
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
 #, c-format
 msgid ""
 "\"\n"
@@ -3335,56 +3384,56 @@ msgstr ""
 "\"\n"
 "�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
 
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
 
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
 msgid "You have signed these user IDs:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
 
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s%s\n"
 
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �� %08lX �M�P�� %s\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
 msgid "You are about to revoke these signatures:\n"
 msgstr "�p���b�M�P�o���G\n"
 
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s\n"
 
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
 msgid " (non-exportable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
 msgid "no secret key\n"
 msgstr "�S���p�_\n"
 
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
@@ -3393,12 +3442,12 @@ msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
 #. created in the future, so we need to warn the user and
 #. set our revocation timestamp one second after that so
 #. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3334
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
 
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
 msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
@@ -3427,34 +3476,34 @@ msgstr "ñ���аO�G "
 msgid "not human readable"
 msgstr "���O�H����Ū�o����"
 
-#: g10/keylist.c:225
+#: g10/keylist.c:229
 msgid "Keyring"
 msgstr "�_�Ͱ�"
 
 #. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
 #, c-format
 msgid " [expires: %s]"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
 msgid "Primary key fingerprint:"
 msgstr "�D�_�����G"
 
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
 msgid "     Subkey fingerprint:"
 msgstr "              �l�_�����G"
 
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
 msgid " Primary key fingerprint:"
 msgstr " �D�_�����G"
 
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
 msgid "      Subkey fingerprint:"
 msgstr "               �l�_�����G"
 
 #. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
 msgid "     Key fingerprint ="
 msgstr "            ���_���� ="
 
@@ -3559,80 +3608,87 @@ msgstr "ñ�����Ҥw�Q����\n"
 msgid "can't handle these multiple signatures\n"
 msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
 
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %08lX\n"
 
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver.  I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "�S���i������"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
 msgid "BAD signature from \""
 msgstr "*�l�a* ��ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
 msgid "Expired signature from \""
 msgstr "�L����ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
 msgid "Good signature from \""
 msgstr "���n��ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
 msgid "[uncertain]"
 msgstr "[���T�w]"
 
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
 msgid "Signature expired %s\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
 msgid "Signature expires %s\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "�o��ñ�p�b %s �L���C\n"
 
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%s ñ���ӦۡG \"%s\"\n"
+msgstr "%s �A�K�n�t��k %s\n"
 
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
 msgid "binary"
-msgstr "primary"
+msgstr "�G�i��"
 
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
 msgid "textmode"
-msgstr ""
+msgstr "��r�Ҧ�"
 
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
 msgid "unknown"
-msgstr "����������"
+msgstr "����"
 
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�L�k�ˬdñ���G %s\n"
 
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
 msgid "not a detached signature\n"
 msgstr "���O�@��������ñ��\n"
 
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ĵ�i�G������h��ñ���C�馳�Ĥ@��ñ���׷|�Q�ֿ�C\n"
 
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���� 0x%02x ���W��ñ��\n"
 
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�«� (PGP 2.x) ñ��\n"
 
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
 
@@ -3651,7 +3707,7 @@ msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
 
 #: g10/misc.c:300
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �K�X�k�~���Ҳդ��s�b\n"
+msgstr "IDEA �s�K�k�~���Ҳդ��s�b\n"
 
 #: g10/misc.c:301
 msgid ""
@@ -3673,12 +3729,17 @@ msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "��H \"%s%s\" �N��\n"
 
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
+
+#: g10/parse-packet.c:121
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�L�k�ާ@���}���_�t��k %d\n"
 
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
@@ -3877,8 +3938,8 @@ msgid "failed sending to `%s': status=%u\n"
 msgstr "�ǰe�� `%s' ���ɭԥ��ѤF�G���A=%u\n"
 
 #: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
 
 #: g10/hkp.c:519
 #, c-format
@@ -3968,52 +4029,54 @@ msgstr "���]���_ %08lX ���l�añ���ɦ]��Y�ӥ���������줸\n"
 msgid "key %08lX: no subkey for subkey revocation packet\n"
 msgstr "���_ %08lX: �S���l�_�M�P�ʥ]�һݪ��l�_\n"
 
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+
+#: g10/sign.c:79
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^��ñ������J�аO���\n"
 
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
 msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_ñ������J�аO���\n"
 
-#: g10/sign.c:105
+#: g10/sign.c:106
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "ĵ�i�G�аO %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
 
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^������J��h URL\n"
 
-#: g10/sign.c:142
+#: g10/sign.c:143
 msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_����J��h URL\n"
 
-#: g10/sign.c:155
+#: g10/sign.c:156
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "ĵ�i�G��h url �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
 
-#: g10/sign.c:307
+#: g10/sign.c:308
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�ˬd�w�إߪ�ñ���ɵo�Ϳ��~�G %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:317
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s ñ���ӦۡG \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:466
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:649
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
 
@@ -4027,11 +4090,11 @@ msgstr "�L�k�إ� %s: %s\n"
 msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/sign.c:796
+#: g10/sign.c:797
 msgid "signing:"
 msgstr "ñ�p�G"
 
-#: g10/sign.c:895
+#: g10/sign.c:896
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
 
@@ -4109,9 +4172,9 @@ msgid "NOTE: trustdb not writable\n"
 msgstr "�Ъ`�N�G�H����Ʈw���i�g�J\n"
 
 #: g10/tdbio.c:579
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%S: �L�Ī��H����Ʈw\n"
+msgstr "%s: �L�Ī��H����Ʈw\n"
 
 #: g10/tdbio.c:611
 #, c-format
@@ -4232,35 +4295,34 @@ msgstr "�H����Ʈw�G�P�B�ƥ��ѡG %s\n"
 msgid "no need for a trustdb check\n"
 msgstr "�H����Ʈw�ˬd���ݭn\n"
 
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�]�� %s �i��U�@�Ӹ�Ʈw�ˬd\n"
 
 #: g10/trustdb.c:819
 msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "��@�� --check-trustdb\n"
 
 #: g10/trustdb.c:823
 msgid "checking the trustdb\n"
 msgstr "���b�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
 #, c-format
 msgid "public key %08lX not found: %s\n"
 msgstr "���_ %08lX �S���Q���G %s\n"
 
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
 
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
 msgid "no ultimately trusted keys found\n"
-msgstr "�����H�����_ %08lX �����_�S���Q���\n"
+msgstr "�S������������H�������_\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "�����H�����_ %08lX �����_�S���Q���\n"
@@ -4268,7 +4330,7 @@ msgstr "�����H�����_ %08lX �����_�S���Q���\n"
 #. This should be valid=%d now, but I'm not changing it so I
 #. don't break the translated strings in the stable branch.
 #. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1720
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr "���b�ˬd�`�� %d ñ�p=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -4832,9 +4894,9 @@ msgid "Enter JPEG filename for photo ID: "
 msgstr "��J�n���@�ۤ� ID �� JPEG �ɦW�G "
 
 #: g10/photoid.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open photo \"%s\": %s\n"
-msgstr "�L�k������ɸ��|�]�� %s\n"
+msgstr "�L�k�}�ҷӤ� \"%s\": %s\n"
 
 #: g10/photoid.c:97
 msgid "Are you sure you want to use it (y/N)? "
@@ -4850,9 +4912,8 @@ msgid "Is this photo correct (y/N/q)? "
 msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
 
 #: g10/photoid.c:331
-#, fuzzy
 msgid "unable to display photo ID!\n"
-msgstr "�L�k������ɸ��|�]�� %s\n"
+msgstr "�L�k��ܷӤ� ID �I\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
@@ -4943,7 +5004,7 @@ msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
 
 #: g10/revoke.c:310 g10/revoke.c:534
 msgid "ASCII armored output forced.\n"
-msgstr "�w�j���ϥ� ASCII �ʸ˹L����X\n"
+msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
 
 #: g10/revoke.c:324 g10/revoke.c:548
 #, c-format
@@ -5002,34 +5063,33 @@ msgstr ""
 "���O�d�U�p�ߡG�p�������W���C�L�t�Υi��|�b�C�L�L\n"
 "�{����o�Ǹ�ƼȦs�b�Y�Ө�L�H�]����ݱo�쪺�a��I\n"
 
-#: g10/revoke.c:614
-#, fuzzy
+#: g10/revoke.c:615
 msgid "Please select the reason for the revocation:\n"
 msgstr "�п�ܺM�P����]�G\n"
 
-#: g10/revoke.c:624
+#: g10/revoke.c:625
 msgid "Cancel"
 msgstr "����"
 
-#: g10/revoke.c:626
+#: g10/revoke.c:627
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "�]�]�\�p�|�Q�n�b�o�̿�� %d �^\n"
 
-#: g10/revoke.c:667
+#: g10/revoke.c:668
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�п�J��Ϊ��y�z�F�H�ťզC�����G\n"
 
-#: g10/revoke.c:695
+#: g10/revoke.c:696
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "�M�P��]�G %s\n"
 
-#: g10/revoke.c:697
+#: g10/revoke.c:698
 msgid "(No description given)\n"
-msgstr "�]�S�����q�y�z�^\n"
+msgstr "�]�S�����w�y�z�^\n"
 
-#: g10/revoke.c:702
+#: g10/revoke.c:703
 msgid "Is this okay? "
 msgstr "�o�˥i�H�ܡH "
 
@@ -5039,7 +5099,7 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# �۹������H���ȲM��A�إߩ� %s\n"
+"# �۹������H���ȲM��Q�إߩ� %s\n"
 "# �]�Х� \"gpg --import-ownertrust\" �Ө��^���̡^\n"
 
 #: g10/tdbdump.c:140
@@ -5074,5 +5134,8 @@ msgstr "�M��H���O���ɿ��~�G %s\n"
 msgid "read error: %s\n"
 msgstr "Ū�����~�G %s\n"
 
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+
 #~ msgid "The use of this algorithm is deprecated - create anyway? "
 #~ msgstr "�o�Ӻt��k�ä��Q��ij�ϥ� �w �L�צp���٬O�~��ܡH "