18 files changed, 7951 insertions, 7801 deletions
diff --git a/ChangeLog b/ChangeLog
index f3fbca869..9db937e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-10  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (dist-hook): Create the version file.
+	* configure.in: Set the libtool version here, removed the need
+	for the version file.
+
 Mon Sep 18 16:35:45 CEST 2000  Werner Koch  <wk@openit.de>
 
         * acinclude.m4 (GNUPG_CHECK_MLOCK):  Removed that silly mkdir().
diff --git a/Makefile.am b/Makefile.am
index b9983fd19..829715459 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,12 +25,16 @@ endif
 
 SUBDIRS = intl zlib jnlib util mpi cipher ${gcrypt} g10 po tools \
           ${agent} doc ${checks}
-EXTRA_DIST = README-alpha VERSION  PROJECTS BUGS
+EXTRA_DIST = README-alpha PROJECTS BUGS
 # gettext never gets it right, so we take here care of deleting the
 # symlink.  my_clean_gcrypt is just a kludge until we can include
 # libgcrypt.
 DISTCLEANFILES = gnupg-defs.h intl/libintl.h ${my_clean_gcrypt}
 
+
+# Add all the files listed in "distfiles" files to the distribution,
+# apply version number s to some files and create a VERSION file which
+# we need for the Prereq: patch file trick.
 dist-hook:
 	@set -e; \
 	 for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \
@@ -43,7 +47,8 @@ dist-hook:
 	@set -e; \
 	sed -e 's/@pkg_version@/$(VERSION)/g' \
 	    $(top_srcdir)/scripts/gnupg.spec.in \
-	    > $(distdir)/scripts/gnupg.spec
+	    > $(distdir)/scripts/gnupg.spec ; \
+	echo "$(VERSION)" > $(distdir)/VERSION
 
 
 if MAINTAINER_MODE
diff --git a/VERSION b/VERSION
deleted file mode 100644
index bff94ddaa..000000000
--- a/VERSION
+++ /dev/null
@@ -1,2 +0,0 @@
-1.1.1a
-
diff --git a/configure.in b/configure.in
index 133e65b13..ca0d04673 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,24 @@ AC_INIT(g10/gpg.c)
 AC_CONFIG_AUX_DIR(scripts)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(gnupg,`cat $srcdir/VERSION`)
+#############################################
+# Version numbers (Rember to change them just before a release)
+# 1. No interfaces changed, only implementations (good): Increment REVISION.
+# 2. Interfaces added, none removed (good): Increment CURRENT, increment
+#    AGE, set REVISION to 0.
+# 3. Interfaces removed (BAD, breaks upward compatibility): Increment
+#    CURRENT, set AGE and REVISION to 0.
+AM_INIT_AUTOMAKE(gnupg,1.1.1a)
+LIBGCRYPT_LT_CURRENT=1
+LIBGCRYPT_LT_AGE=0
+LIBGCRYPT_LT_REVISION=0
+##############################################
+
+AC_SUBST(LIBGCRYPT_LT_CURRENT)
+AC_SUBST(LIBGCRYPT_LT_AGE)
+AC_SUBST(LIBGCRYPT_LT_REVISION)
+
+
 
 ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"
 static_modules="sha1 md5 rmd160"
diff --git a/po/da.po b/po/da.po
index 31e752d59..3bd6d6525 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: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -31,7 +31,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "afslut"
 
@@ -241,7 +241,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -293,11 +293,11 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -311,7 +311,7 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +334,7 @@ msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -342,139 +342,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -484,158 +484,162 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,16 +659,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 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/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -674,7 +678,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -682,200 +686,204 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
 "understregning\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -958,7 +966,7 @@ msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
@@ -1161,12 +1169,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
@@ -1187,34 +1195,34 @@ msgstr "Indtast bruger-id: "
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt med --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fejl ved unders�gelse af n�gle: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -1226,58 +1234,58 @@ msgstr "skriver selvsignatur\n"
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1286,19 +1294,19 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillader kun n�glest�rrelser fra 512 til 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1310,42 +1318,42 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1355,36 +1363,36 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1394,44 +1402,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1442,28 +1450,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1471,11 +1479,11 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1483,7 +1491,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1491,56 +1499,56 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1551,42 +1559,37 @@ msgstr "%s: kan ikke �bne: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "certifikatl�seproblem: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, 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:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1594,262 +1597,251 @@ msgstr "ADVARSEL: intet blev eksporteret\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA n�gle kan ikke bruges i denne version\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Ingen n�gle for bruger-ID\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Ingen bruger-ID for n�gle\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: bruger ikke fundet\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       nye undern�gler: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, 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:419
-msgid "no default public keyring\n"
-msgstr "ingen standard offentlig n�glering\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan ikke l�se n�glering `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1858,597 +1850,592 @@ 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:880
+#: g10/import.c:848
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: bruger ikke fundet\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr ""
 
@@ -2573,26 +2560,16 @@ msgstr "gammeldags (PGP 2.x) signatur\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr ""
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2601,7 +2578,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2708,30 +2685,30 @@ msgstr "l�ser stdin ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
@@ -2770,63 +2747,63 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -2865,8 +2842,8 @@ msgstr ""
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -2966,285 +2943,290 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr ""
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/trustdb.c:495
+#: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
+msgid "key %08lX: can't put it into the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:508
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
+msgid "key %08lX: query record failed\n"
 msgstr ""
 
-#: g10/trustdb.c:514
+#: g10/trustdb.c:517
 #, c-format
-msgid "key %08lX: can't put it into the trustdb\n"
+msgid "key %08lX: already in trusted key table\n"
 msgstr ""
 
 #: g10/trustdb.c:520
 #, c-format
-msgid "key %08lX: query record failed\n"
+msgid "key %08lX: accepted as trusted key.\n"
 msgstr ""
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#: g10/trustdb.c:566
 #, c-format
-msgid "key %08lX: already in trusted key table\n"
+msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr ""
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:585
 #, c-format
-msgid "key %08lX: accepted as trusted key.\n"
+msgid "key %08lX: secret and public key don't match\n"
 msgstr ""
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr ""
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Godt certifikat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr ""
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr ""
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr ""
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr ""
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3260,40 +3242,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3301,49 +3283,49 @@ msgid ""
 msgstr ""
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Fil `%s' eksisterer. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Overskriv (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ukendt suffiks\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Indtast nyt filnavn"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skriver til stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr ""
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3371,23 +3353,23 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr ""
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
@@ -3583,6 +3565,30 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "certifikatl�seproblem: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA n�gle kan ikke bruges i denne version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen n�gle for bruger-ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Ingen bruger-ID for n�gle\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "ingen standard offentlig n�glering\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan ikke l�se n�glering `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: bruger ikke fundet\n"
+
 #~ msgid "not processed"
 #~ msgstr "ikke bearbejdet"
 
diff --git a/po/de.po b/po/de.po
index 25203f0da..a2e3138b2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-06-12  12:50+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -28,7 +28,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
@@ -238,7 +238,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -291,11 +291,11 @@ msgstr "kann '%s' nicht schliessen: %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "Zu viele Zufallswerte angefordert: Die Grenze liegt bei %d\n"
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -309,7 +309,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -336,7 +336,7 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +344,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,156 +486,160 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -644,7 +648,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -664,17 +668,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +688,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,189 +696,193 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 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/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
 "ein Unterstrich sein\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -882,12 +890,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -972,7 +980,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
@@ -1212,12 +1220,12 @@ msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
@@ -1238,36 +1246,36 @@ msgstr "Geben Sie die User-ID ein: "
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1279,60 +1287,60 @@ msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte w�hlen Sie, welche Art von Schl�ssel Sie m�chten:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 "M�chten Sie wirklich einen Unterschriften-/Verschl�sselungschl�ssel "
 "erzeugen? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1345,19 +1353,19 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
@@ -1370,12 +1378,12 @@ msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Sch�sselgr��e zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1383,11 +1391,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1395,21 +1403,21 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1425,25 +1433,25 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "Der Schl�ssel verf�llt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schl�ssel verf�llt am %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1451,11 +1459,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1471,44 +1479,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1519,27 +1527,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 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:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1547,11 +1555,11 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1564,7 +1572,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1575,29 +1583,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schl�ssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1606,12 +1614,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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1619,7 +1627,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1627,11 +1635,11 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1642,42 +1650,37 @@ msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: Benutzer nicht gefunden: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "Zertifikat Leseproblem: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, 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:182
+#: g10/export.c:175
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
@@ -1685,267 +1688,257 @@ msgstr "WARNUNG: Nichts exportiert\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-Schl�ssel k�nnen in dieser Version nicht verwendet werden\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Kein Schl�ssel f�r User-ID\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Keine User-ID f�r Schl�ssel\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, 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/getkey.c:2513
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "  neue Unterschl�ssel: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ohne User-ID: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importiert: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          unver�ndert: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        neue User-IDs: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "  neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        neue Signaturen: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " gelesene geheime Schl.: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, 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:419
-msgid "no default public keyring\n"
-msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "Schl�ssel %08lX: dies ist kein rfc2440-Sch�ssel - �bersprungen\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, 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:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, 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:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, 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:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, 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:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1954,99 +1947,94 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, 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:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: Benutzer nicht gefunden\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2054,7 +2042,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2062,33 +2050,33 @@ msgstr ""
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2096,7 +2084,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2104,421 +2092,421 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 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:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 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:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2527,34 +2515,34 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
@@ -2685,28 +2673,16 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen\n"
-"neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diese Verschl�sselungsmethode taugt nicht mehr viel; verwenden Sie eine "
@@ -2717,7 +2693,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2831,30 +2807,30 @@ msgstr "lese stdin ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empf�nger: Versuch mit geheimen Schl�ssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empf�nger.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "Versch�sselungsverfahren %d ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
@@ -2893,69 +2869,69 @@ msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ung�ltiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunde j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunden j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -2994,8 +2970,8 @@ msgstr "%s: kann nicht zugegriffen werden: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3097,292 +3073,295 @@ msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg "
 "--fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, type %d: write failed: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "Vertrauenssatz %lu: l�schen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Lesen des Dir-Satzes f�r LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: Dir-Satz erwartet, aber es kam Typ %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "Kein Hauptschl�ssel f�r LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Lesen den Hauptschl�ssels der LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "HINWEIS: Geheimer Schl�ssel %08lX ist NICHT gesch�tzt.\n"
-
-#: g10/trustdb.c:495
-#, 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/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr ""
-"Schl�ssel %08lX: geheimer und �ffentlicher Schl�ssel passen nicht zusammen.\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "Schl�ssel %08lX kann nicht in die \"trustdb\" eingef�gt werden\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "Schl�ssel %08lX: Satzabfrage fehlgeschlagen\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "Schl�ssel %08lX: Ist bereits in geheimer Schl�sseltabelle\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "HINWEIS: Geheimer Schl�ssel %08lX ist NICHT gesch�tzt.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr ""
+"Schl�ssel %08lX: geheimer und �ffentlicher Schl�ssel passen nicht zusammen.\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schl�ssel %08lX.%lu: Korrekte Unterschl�ssel-Anbindung\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Ung�ltige Unterschl�ssel-Anbindung: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Schl�sselwiderruf\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Ung�ltiger Schl�sselwiderruf: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Ung�ltige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "G�ltiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "G�ltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Ung�ltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "G�ltiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Ung�ltiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Ung�ltiges Zertifikat"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingef�gt\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schl�ssel bearbeitet\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schl�ssel mit Fehlern\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schl�ssel eingef�gt\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: Dir-Satz ohne Schl�ssel - �bergangen\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu wegen neuer Schl�ssel\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schl�ssel �bersprungen\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schl�ssel ge�ndert\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schl�ssel\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "Schl�ssel %08lX: 'trust record' einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Schl�ssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingef�gt\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 
@@ -3401,40 +3380,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "�bersprungen '%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3444,49 +3423,49 @@ msgstr ""
 "ist f�r Signaturen NICHT sicher genug!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "�berschreiben (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "Sie m�ssen GnuPG noch einmal starten, damit es die neue Optionsdatei liest\n"
@@ -3518,25 +3497,25 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
 "entfernen.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 
@@ -3834,6 +3813,38 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "Zertifikat Leseproblem: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-Schl�ssel k�nnen in dieser Version nicht verwendet werden\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Kein Schl�ssel f�r User-ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Keine User-ID f�r Schl�ssel\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr ""
+#~ "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: Benutzer nicht gefunden\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen\n"
+#~ "neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n"
+
 #~ msgid "not processed"
 #~ msgstr "nicht bearbeitet"
 
diff --git a/po/eo.po b/po/eo.po
index d33016790..b8003eb79 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-06-02 21:04+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "fini"
 
@@ -239,7 +239,7 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -291,11 +291,11 @@ msgstr "ne povas fermi '%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "tro da stokastaj bitoj petitaj; la limo estas %d\n"
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -309,7 +309,7 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -332,7 +332,7 @@ msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -340,139 +340,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -482,152 +482,156 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -635,7 +639,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +659,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +677,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,187 +685,191 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVERTO: programo povas krei core-dosieron!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -869,11 +877,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -958,7 +966,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
@@ -1188,12 +1196,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
@@ -1214,34 +1222,34 @@ msgstr "Donu la uzantidentigilon: "
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorita: publika �losilo jam difinita per --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: eraro dum kontrolo de �losilo: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -1253,58 +1261,58 @@ msgstr "skribas mem-subskribon\n"
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1317,19 +1325,19 @@ msgstr ""
 "               implicita �losilgrando estas 1024 bitoj\n"
 " plej granda rekomendata �losilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
@@ -1342,12 +1350,12 @@ msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1355,11 +1363,11 @@ msgstr ""
 "�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "�ar la komputado da�ras TRE longe!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1367,21 +1375,21 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1397,25 +1405,25 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "�losilo neniam eksvalidi�os\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "�losilo eksvalidi�os je %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1423,11 +1431,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1450,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1490,27 +1498,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 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:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1518,11 +1526,11 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1534,7 +1542,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1546,29 +1554,29 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1576,12 +1584,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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1589,7 +1597,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1597,11 +1605,11 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "�u vere krei? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1612,42 +1620,37 @@ msgstr "%s: ne povas malfermi: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: uzanto ne trovita: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "problemo �e legado de atestilo: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1655,263 +1658,252 @@ msgstr "AVERTO: nenio estis eksportita\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - mal�altas\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Mankas �losilo por uzantidentigilo\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Mankas uzantidentigilo por �losilo\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: uzanto ne trovita\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novaj sub�losiloj: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "mankas implicita publika �losilaro\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "ne povas �losi la �losilaron '%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1920,98 +1912,93 @@ 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:880
+#: g10/import.c:848
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: uzanto ne trovita\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Jam subskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2019,7 +2006,7 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2027,33 +2014,33 @@ msgstr ""
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2061,7 +2048,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2069,421 +2056,421 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "�losilo %08lX: sub�losilo estas revokita!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 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:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2492,34 +2479,34 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
@@ -2645,28 +2632,16 @@ msgstr "malnovstila subskribo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVERTO: programo povas krei core-dosieron!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA-�losiloj estas malrekomendataj; bonvolu pripensi krei novan �losilon kaj "
-"uzi tiun en la estonteco\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
@@ -2675,7 +2650,7 @@ msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -2788,30 +2763,30 @@ msgstr "legas la normalan enigon ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "�ifrad-metodo %d estas nekonata a� mal�altita\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -2850,65 +2825,65 @@ msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 msgid "secret key parts are not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "protekto-metodo %d ne estas realigita\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Nevalida pasfrazo; bonvolu provi denove ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�i tio estas PGP-kreita ElGamal-�losilo, kiu NE estas sekura por "
 "subskribado!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTO: subskribo-�losilo eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -2947,8 +2922,8 @@ msgstr "%s: ne povas aliri: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
@@ -3048,286 +3023,291 @@ msgstr "%s: malsukcesis aldoni registron: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "fido-datenaro loko %lu, petospeco %d: lego malsukcesis: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "fido-registro %lu: forvi�o malsukcesis: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "eraro dum legado de dosieruja registro por LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: atendis dosierujan registron, trovis specon %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "mankas �efa �losilo por LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "eraro dum legado de �efa �losilo por LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTO: sekreta �losilo %08lX NE estas protektita.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ne valida �losilidentigilo\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "�losilo %08lX: sekreta kaj publika �losiloj ne kongruas\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "�losilo %08lX: ne povas meti �in en la fido-datenaron\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "�losilo %08lX: peto-registro malsukcesis\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "�losilo %08lX: jam en tabelo de fidataj �losiloj\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "�losilo %08lX: akceptita kiel fidata �losilo.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "�losilo %08lX: ne protektita - ignorita\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTO: sekreta �losilo %08lX NE estas protektita.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "�losilo %08lX: sekreta kaj publika �losiloj ne kongruas\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "�losilo %08lX.%lu: Bona sub�losila bindado\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "�losilo %08lX.%lu: Nevalida sub�losila bindado: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "�losilo %08lX.%lu: Valida �losilrevoko\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "�losilo %08lX.%lu: Nevalida �losilrevoko: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Bona mem-subskribo"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Nevalida mem-subskribo"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "Valida uzantidentigil-revoko ignorita pro pli nova mem-subskribo"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Valida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Nevalida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Valida atestilrevoko"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Bona atestilo"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Nevalida atestilrevoko"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Nevalida atestilo"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "subskribo-registro %lu[%d] montras al mal�usta registro.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir malsukcesis: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: en�ovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: en�ovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: en�ovita\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu �losiloj traktitaj\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu �losiloj kun eraroj\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu �losiloj en�ovitaj\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dosieruja registro sen �losilo - ignorita\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pro novaj publikaj �losiloj\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu �losiloj aktualigitaj\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Hu, mankas �losiloj\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Hu, mankas uzantidentigiloj\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ser�o pri dosieruja registro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "�losilo %08lX: en�ovo de fidoregistro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "�losilo %08lX.%lu: en�ovis en fido-datenaron\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "�losilo %08lX.%lu: kreita en la estonteco (tempotordo a� horlo�eraro)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "�losilo %08lX.%lu: eksvalidi�is je %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "�losilo %08lX.%lu: fido-kontrolo malsukcesis: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemo dum trovo de '%s' en fido-datenaro: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "uzanto '%s' ne estas en fido-datenaro - en�ovas\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
@@ -3346,40 +3326,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ne povas krei �losilaron: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3389,49 +3369,49 @@ msgstr ""
 "por subskribado!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Dosiero '%s' ekzistas. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nekonata sufikso\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Donu novan dosiernomon"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skribas al la normala eligo\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "supozas subskribitajn datenojn en '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vi devas restartigi GnuPG, por ke �i povu legi la novan opcio-dosieron\n"
@@ -3462,23 +3442,23 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
@@ -3742,6 +3722,37 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problemo �e legado de atestilo: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Mankas �losilo por uzantidentigilo\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Mankas uzantidentigilo por �losilo\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "mankas implicita publika �losilaro\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "ne povas �losi la �losilaron '%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: uzanto ne trovita\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA-�losiloj estas malrekomendataj; bonvolu pripensi krei novan �losilon kaj "
+#~ "uzi tiun en la estonteco\n"
+
 #~ msgid "not processed"
 #~ msgstr "ne traktita"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 6f4b8216c..9463c0a68 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -38,7 +38,7 @@ msgstr ""
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -300,12 +300,12 @@ msgstr "no puede abrirse `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATENCI�N: �se est� usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -319,7 +319,7 @@ msgstr ""
 "�NO USE NING�N DATO GENERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +343,7 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -351,140 +351,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -494,164 +494,168 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
 "para las contrase�as"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -671,15 +675,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -689,7 +693,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -697,187 +701,191 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, 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/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "El primer caracter de una notaci�n debe ser una letra o un subrayado\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -885,11 +893,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 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"
 
@@ -974,7 +982,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
@@ -1206,12 +1214,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave p�blica ya presente\n"
@@ -1232,34 +1240,34 @@ msgstr "Introduzca el ID de usuario: "
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave p�blica ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1271,58 +1279,58 @@ msgstr "escribiendo autofirma\n"
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firma)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrado)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�De verdad quiere crear una clave de firma y cifrado? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Elecci�n no v�lida.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1335,19 +1343,19 @@ msgstr ""
 "        el tama�o por defecto es 1024 bits\n"
 " el tama�o m�ximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
@@ -1360,12 +1368,12 @@ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1373,11 +1381,11 @@ msgstr ""
 "No se recomiendan claves de m�s de 2048 bits porque\n"
 "el tiempo de computaci�n es REALMENTE largo.\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,21 +1394,21 @@ msgstr ""
 "teclado\n"
 "tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "�De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,35 +1424,35 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "valor no v�lido\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1462,44 +1470,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Direcci�n no v�lida\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1510,28 +1518,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1539,11 +1547,11 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1555,7 +1563,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1568,29 +1576,29 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1599,12 +1607,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1612,7 +1620,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:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1620,11 +1628,11 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1635,42 +1643,37 @@ msgstr "%s: no puede abrirse: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: usuario no encontrado: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "problema en la lectura del certificado: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1678,264 +1681,253 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "No puede usarse clave RSA en esta versi�n\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "No hay clave para tal usuario\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "No hay clave secreta para tal usuario\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           nuevas subclaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "no hay anillo p�blico por defecto\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "no puede bloquearse el anillo `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposibile applicar el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1944,99 +1936,94 @@ msgstr "clave %08lX: subclave 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:880
+#: g10/import.c:848
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
-#: g10/import.c:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: usuario no encontrado\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2044,7 +2031,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2052,34 +2039,34 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2087,7 +2074,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2095,421 +2082,421 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "�Revocar realmente esta clave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no v�lido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma no v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2518,34 +2505,34 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
@@ -2670,28 +2657,16 @@ msgstr "firma viejo estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�No se deber�an usar algoritmos experimentales!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
-"para futuros usos\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado est� en desuso, considere el uso de uno m�s "
@@ -2702,7 +2677,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, 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"
@@ -2817,30 +2792,30 @@ msgstr "leyendo stdin...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificaci�n vieja de DEK no est� soportada\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
@@ -2879,65 +2854,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCI�N: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -2977,8 +2952,8 @@ msgstr "%s: no puede abrirse: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3080,288 +3055,293 @@ msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confianza %lu: fallo al borrar: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "error leyendo registro de directorio del LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "no hay clave primaria para el LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "error leyendo clave primaria para el LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallida: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s' no es un identificativo largo de clave v�lido\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "clave %08lX: petici�n de registro fallida\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "clave %08lX: ya est� en la tabla de confianza\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "clave %08lX: aceptada como clave de confianza.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "clave %08lX: clave de confianza sin clave p�blica - ignorada\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeraci�n de claves secretas fallida: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave v�lida\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave v�lida\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave no v�lida: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de subclave v�lida\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Autofirma v�lida"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Autofirma no v�lida"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revocaci�n v�lida de ID de usuario ignorada debido a autofirma m�s reciente"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Revocaci�n de ID de usuario v�lida"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Revocaci�n de ID de usuario no v�lida."
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocaci�n incorrecto"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - eliminado"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "error leyendo registro de directorio: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraci�n bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay ning�n ID de usuario\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: b�squeda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clave %08lX: inserci�n del registro de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobaci�n de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no est� en la tabla de confianza - insertando\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
@@ -3377,40 +3357,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3420,49 +3400,49 @@ msgstr ""
 "para las firmas\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "�Sobreescribir (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3493,23 +3473,23 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "�hay una clave secreta para esta clave p�blica!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "�Eliminar esta clave del anillo? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 
@@ -3757,6 +3737,40 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problema en la lectura del certificado: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "No puede usarse clave RSA en esta versi�n\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "No hay clave para tal usuario\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "No hay clave secreta para tal usuario\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "no hay anillo p�blico por defecto\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "no puede bloquearse el anillo `%s': %s\n"
+
+#~ msgid "error writing keyring `%s': %s\n"
+#~ msgstr "error escribiendo anillo `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: usuario no encontrado\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
+#~ "para futuros usos\n"
+
 #, fuzzy
 #~ msgid "not processed"
 #~ msgstr "se han procesado %lu claves\n"
@@ -3878,9 +3892,6 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "no puede bloquearse el anillo p�blico `%s': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "error escribiendo anillo `%s': %s\n"
-
 #~ msgid "can't open file: %s\n"
 #~ msgstr "no puede abrirse el fichero: %s\n"
 
@@ -3920,15 +3931,9 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "uso: gpgm [opciones] "
 
-#~ msgid "|KEYID|ulimately trust this key"
-#~ msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "registro de firma encadenado %lu tiene el propietario equivocado\n"
 
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "clave %08lX: clave de confianza sin clave p�blica - ignorada\n"
-
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "lid %lu: lectura registro de directorio fallida: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index 5f75e607b..7def3e1bb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Ga�l Qu�ri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -34,7 +34,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "quitter"
 
@@ -244,7 +244,7 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -300,12 +300,12 @@ msgstr ""
 "une quantit� de donn�es al�atoires trop importante a �t� demand�e.\n"
 "La limite est %d bits.\n"
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 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:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -319,7 +319,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -344,7 +344,7 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -352,139 +352,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "enlever la cl� du porte-cl�s secret"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -494,152 +494,156 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -647,7 +651,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,17 +671,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -687,7 +691,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/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -695,189 +699,193 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, 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/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -886,13 +894,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent �tre entour�s d'autes "
 "caract�res\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 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"
 
@@ -977,7 +985,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
@@ -1210,12 +1218,12 @@ msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
@@ -1236,34 +1244,34 @@ msgstr "Entrez le nom d'utilisateur: "
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le r�cipient par d�faut\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignor�: cl� publique configur�e par --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erreur pendant la v�rification de la cl�: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1277,58 +1285,58 @@ msgstr "�criture de l'auto-signature\n"
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voulez-vous vraiment cr�er une cl� de signature et de chiffrement ? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1341,19 +1349,19 @@ msgstr ""
 "          la taille par d�faut est 1024 bits\n"
 " la taille maximale conseill�e est 2048 bits\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
@@ -1365,12 +1373,12 @@ msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1378,11 +1386,11 @@ msgstr ""
 "Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1390,21 +1398,21 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
 "clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous r�ellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1420,25 +1428,25 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ans\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1446,11 +1454,11 @@ msgstr ""
 "Votre syst�me ne sait pas afficher les dates au-del� de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'� 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1466,44 +1474,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> �\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1514,28 +1522,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 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:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1543,11 +1551,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique; recommencez.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1559,7 +1567,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1571,29 +1579,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 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:1765
+#: g10/keygen.c:1762
 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"
@@ -1602,13 +1610,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, 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:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1616,7 +1624,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:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1624,11 +1632,11 @@ 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:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1639,42 +1647,37 @@ msgstr "%s: impossible d'ouvrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: utilisateur non trouv�: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "probl�me lors de lecture du certificat: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, 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:182
+#: g10/export.c:175
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
@@ -1682,265 +1685,254 @@ msgstr "ATTENTION: rien n'a �t� export�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "les cl�s RSA ne peuvent �tre utilis�es dans cette version\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Pas de cl� pour l'utilisateur\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Pas d'utilisateur pour la cl�\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, 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/getkey.c:2513
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           nouvelles sous-cl�s: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "pas de porte-cl�s public par d�faut\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "cl� %08lX: cl� publique import�e\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "cl� %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "cl� %08lX: une nouvelle signature\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "cl� %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "cl� %08lX: une nouvelle sous-cl�\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, 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:610
+#: g10/import.c:590
 #, 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:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, 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:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX: certificat de r�vocation import�\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX: auto-signature invalide\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, 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:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "cl� %08lX: utilisateur non sign� par lui-m�me accept�: '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -1949,98 +1941,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, 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:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utilisateur non trouv�\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "D�j� sign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2048,7 +2035,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2056,39 +2043,39 @@ msgstr ""
 "La signature sera marqu�e comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 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:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 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:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2097,422 +2084,422 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 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:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "lister les pr�f�rences"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "la mise � jour de la base de confiance a �chou�: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 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:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 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:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "cl� %08lX: la sous-cl� a �t� r�voqu�e !\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2521,34 +2508,34 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   sign� par %08lX � %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
@@ -2674,28 +2661,16 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Les cl�s RSA sont d�conseill�es: consid�rez cr�er une nouvelle cl�\n"
-"et l'utiliser dans l'avenir\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
@@ -2706,7 +2681,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, 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"
@@ -2821,32 +2796,32 @@ msgstr "lecture de l'entr�e standard...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %08lX...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le r�cipient anonyme.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
 "pr�f�rences\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
@@ -2885,66 +2860,66 @@ msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide; r�essayez...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE: la cl� de signature a expir� le %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION: `%s' est un fichier vide\n"
@@ -2984,8 +2959,8 @@ msgstr "%s: impossible d'acc�der: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossible de cr�er: %s\n"
@@ -3087,296 +3062,301 @@ msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 "enregistrement de confiance %lu, type de requ�te %d: la lecture a �chou�: "
 "%s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "enregistrement de confiance %lu: la suppression a �chou�: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr ""
 "erreur pendant la lecture de l'enregistrement de r�pertoire pour\n"
 "le LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: enregistrement de r�pertoire attendu, a re�u le type %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "pas de cl� principale pour le LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erreur pendant la lecture de la cl� principale pour le LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record a �chou�: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTE: la cl� secr�te %08lX n'est PAS prot�g�e.\n"
-
-#: g10/trustdb.c:495
-#, 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/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: l'identification de la cl� est invalide\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "cl� %08lX: les cl�s secr�te et publique ne correspondent pas\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "cl� %08lX: impossible de la mettre dans la base de confiance\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "cl� %08lX: l'enregistrement de requ�te a �chou�\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "cl� %08lX: d�j� dans la table des cl�s certifi�es\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "cl� %08lX: accept�e comme cl� certifi�e.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTE: la cl� secr�te %08lX n'est PAS prot�g�e.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "cl� %08lX: les cl�s secr�te et publique ne correspondent pas\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "l'�num�ration des cl�s secr�tes a �chou�: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "cl� %08lX.%lu: bonne liaison avec la sous-cl�\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "cl� %08lX.%lu: liaison avec la sous-cl� invalide: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "cl� %08lX.%lu: r�vocation de cl� valide\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "cl� %08lX.%lu: r�vocation de sous-cl� invalide: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "cl� %08lX.%lu: r�vocation de sous-cl� valide\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "La r�vocation valide de nom d'utilisateur a �t� ignor�e car l'auto-\n"
 "signature est plus r�cente"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "R�vocation de nom d'utilisateur valide"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "R�vocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Certificat de r�vocation valide"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "R�vocation de certificat invalide"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 "l'enregistrement de signature %lu[%d] pointe vers un mauvais\n"
 "enregistrement de r�pertoire\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "certificat dupliqu� - supprim�"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a �chou�: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: l'insertion a �chou�: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: l'insertion a �chou�: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ins�r�\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erreur pendant la lecture de l'enregistrement de r�pertoire: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu cl�s trait�es\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu cl�s avec erreurs\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu cl�s ins�r�es\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'�num�ration des blocs de cl�s a �chou�: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: enregistrement de r�pertoire sans cl� - ignor�\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu � cause de nouvelles cl�s publiques\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu cl�s ignor�es\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu cl�s mises � jour\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de cl�\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 "check_trust: la recherche d'enregistrement de r�pertoire a �chou�: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "cl� %08lX: l'insertion d'enregistrement de confiance a �chou�: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "cl� %08lX.%lu: ins�r�e dans la base de confiance\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "cl� %08lX.%lu: cr��e dans le futur (voyage temporel ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "cl� %08lX.%lu: a expir� le %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "cl� %08lX.%lu: la v�rification de confiance a �chou�: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas �t� trouv�: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "probl�me de recherche de '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossible d'ins�rer '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION: les enregistrements de pr�f�rences longs ne sont pas encore\n"
@@ -3399,41 +3379,41 @@ msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossible de cr�er le porte-cl�s: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a �t� ignor�: %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3443,49 +3423,49 @@ msgstr ""
 "s�re pour les signatures !\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "R��crire (o/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffixe inconnu\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nouveau fichier d'options cr��\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossible de cr�er le r�pertoire: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: r�pertoire cr��\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vous devez red�marrer GnuPG pour qu'il puisse lire le nouveau\n"
@@ -3519,23 +3499,23 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "il y a une cl� secr�te pour cette cl� publique !\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Enlever cette cl� du porte-cl�s ? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
@@ -3803,6 +3783,37 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "probl�me lors de lecture du certificat: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "les cl�s RSA ne peuvent �tre utilis�es dans cette version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Pas de cl� pour l'utilisateur\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Pas d'utilisateur pour la cl�\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "pas de porte-cl�s public par d�faut\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utilisateur non trouv�\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Les cl�s RSA sont d�conseill�es: consid�rez cr�er une nouvelle cl�\n"
+#~ "et l'utiliser dans l'avenir\n"
+
 #~ msgid "not processed"
 #~ msgstr "non trait�"
 
diff --git a/po/id.po b/po/id.po
index df0c4d3eb..0ae4c61b1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesia <id@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "keluar"
 
@@ -239,7 +239,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -291,11 +291,11 @@ msgstr "tidak dapat membuka `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -309,7 +309,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -332,7 +332,7 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -340,140 +340,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -483,158 +483,162 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -654,15 +658,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -672,7 +676,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -680,187 +684,191 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "PERINGATAN: program mungkin membuat file core!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -868,11 +876,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -957,7 +965,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
@@ -1185,12 +1193,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
@@ -1209,34 +1217,34 @@ msgstr "Masukkan ID user: "
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -1248,58 +1256,58 @@ msgstr "menulis self signature\n"
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1312,19 +1320,19 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1337,12 +1345,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1350,11 +1358,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1362,21 +1370,21 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1392,35 +1400,35 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1435,44 +1443,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1482,28 +1490,28 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1511,11 +1519,11 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1527,7 +1535,7 @@ msgstr ""
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1539,29 +1547,29 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1570,30 +1578,30 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, 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:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, 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:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1604,42 +1612,37 @@ msgstr "%s: tidak dapat dibuka: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: user tidak ditemukan: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "masalah pembacaan sertifikat: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1647,264 +1650,253 @@ msgstr "PERINGATAN: tidak ada yang diekspor\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Tidak ada kunci untuk ID user\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Tidak ada ID user untuk kunci\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
 
-#: g10/getkey.c:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: user tidak ditemukan\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "          subkey baru: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "tidak ada keyring publik baku\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "tidak dapat mengunci keyring `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat mengalokasi keyblock orisinal: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1913,98 +1905,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: user tidak ditemukan\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2012,7 +1999,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2020,34 +2007,34 @@ msgstr ""
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "kunci rahasia tidak ada"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2055,7 +2042,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2063,455 +2050,455 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "tampilkan preferensi"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat dilakukan dalam mode batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "gagal perbarui trustdb: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
@@ -2637,28 +2624,16 @@ msgstr "signature model lama (PGP 2.X)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "PERINGATAN: program mungkin membuat file core!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
-"masa depan\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
@@ -2668,7 +2643,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -2782,30 +2757,30 @@ msgstr "membaca stdin ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
@@ -2844,64 +2819,64 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "kunci rahasia tidak ada"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase tidak valid; silakan coba lagi ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan rubah passphrase lagi.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -2940,8 +2915,8 @@ msgstr "%s: tidak dapat akses: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
@@ -3041,286 +3016,291 @@ msgstr "%s: gagal menambahkan record: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req tipe %d: gagal baca: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "trust record %lu: gagal menghapus: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "gagal membaca dir record untuk LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: diharapkan dir record, didapat tipe %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "bukan kunci primer untuk LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "gagal membaca kunci primer untuk LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: gagal search_record: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s bukanlah set karakter yang valid\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "kunci %08lX: kunci publik dan rahasia tidak cocok\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "kunci %08lX: tidak dapat meletakkan ke trustdb\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "kunci %08lX: gagal query record\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "kunci %08lX: sudah ada dalam tabel kunci trustdb\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "kunci %08lX: kunci publik dan rahasia tidak cocok\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "gagal enumerasi kunci rahasia: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "kunci %08lX.%lu: binding subkey baik\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "kunci %08lX.%lu: binding subkey tidak valid: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci valid\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci tidak valid: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan subkey valid\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Self-signature yang baik"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Self-signature tidak valid"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Pembatalan ID user valid"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Pembatalan ID user tidak valid"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Pembatalan sertifikat valid"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Sertifikat yang baik"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Pembatalan sertifikat tidak valid"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Sertifikat tidak valid"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "sig record %lu[%d] menunjuk ke record yang salah.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "sertifikat ganda - dihapus"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir gagal: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: menyisipkan\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "kesalahan membaca dir record: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kunci diproses\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kunci dengan kesalahan\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "%lu kunci disisipkan\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "gagal enumerasi keyblok: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record tanpa kunci - dilewati\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%lu kunci dilewati\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "%lu kunci diperbaharui\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, tanpa kunci\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, tanpa ID user\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: gagal mencari di record: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "kunci %08lX: gagal menyisipkan record trust: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "kunci %08lX.%lu: menyisipkan ke trustdb\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "kunci %08lX.%lu: tercipta di masa datang (masalah waktu atau jam)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "kunci %08lX.%lu: berakhir pada %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "kunci %08lX.%lu: gagal periksa trust: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "masalah menemukan '%s' dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "pemakai '%s' tidak ada di trustdb - menyisipkan\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
@@ -3336,40 +3316,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: tidak dapat membuat keyring: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3379,49 +3359,49 @@ msgstr ""
 "untuk signature!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: file pilihan baru tercipta\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3451,23 +3431,23 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
@@ -3715,6 +3695,37 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "masalah pembacaan sertifikat: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Tidak ada kunci untuk ID user\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Tidak ada ID user untuk kunci\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "tidak ada keyring publik baku\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "tidak dapat mengunci keyring `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: user tidak ditemukan\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
+#~ "masa depan\n"
+
 #, fuzzy
 #~ msgid "not processed"
 #~ msgstr "%lu kunci diproses\n"
diff --git a/po/it.po b/po/it.po
index 147ad5cc2..ee47cb190 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
@@ -239,7 +239,7 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -291,12 +291,12 @@ msgstr "impossibile aprire `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -310,7 +310,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +334,7 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -342,139 +342,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -484,160 +484,164 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 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/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -657,15 +661,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -675,7 +679,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -683,189 +687,193 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, 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/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -873,11 +881,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -962,7 +970,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
@@ -1191,12 +1199,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
@@ -1217,34 +1225,34 @@ msgstr "Inserisci l'user ID: "
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica gi� impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1256,58 +1264,58 @@ msgstr "scrittura della autofirma\n"
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1320,19 +1328,19 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
@@ -1345,12 +1353,12 @@ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1358,11 +1366,11 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1370,21 +1378,21 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave cos� lunga? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1400,25 +1408,25 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1426,11 +1434,11 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1446,44 +1454,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1494,28 +1502,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1523,11 +1531,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1539,7 +1547,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1551,29 +1559,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1582,12 +1590,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1595,7 +1603,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1603,11 +1611,11 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1618,42 +1626,37 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: utente non trovato: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "problema di lettura del certificato: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1661,264 +1664,253 @@ msgstr "ATTENZIONE: non � stato esportato nulla\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "In questa versione non possono essere usate chiavi RSA\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Non ci sono chiavi per questo user ID\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Non ci sono user ID per questa chiave\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utente non trovato\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "       nuove subchiavi: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "nessun portachiavi pubblico predefinito\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, 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:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, 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:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1927,98 +1919,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utente non trovato\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2026,7 +2013,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2034,34 +2021,34 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2069,7 +2056,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2077,421 +2064,421 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chiave %08lX: la subchiave � stata revocata!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2501,34 +2488,34 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
@@ -2654,29 +2641,16 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Le chiavi RSA sono deprecate; per favore considera di creare una nuova "
-"chiave\n"
-"e usarla in futuro\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 
@@ -2685,7 +2659,7 @@ msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2799,31 +2773,31 @@ msgstr "viene letto stdin...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato nelle impostazioni\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
@@ -2862,67 +2836,67 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -2961,8 +2935,8 @@ msgstr "%s: impossibile acedere a: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3062,290 +3036,295 @@ msgstr "%s: accodatura a un record fallita: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, tipo %d: read fallita: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "trust record %lu: delete fallita: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "errore durante la lettura del dir record per il LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: atteso un dir record, trovato uno di tipo %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "manca una chiave primaria per il LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr ""
 "errore durante la lettura della chiave primaria per il\n"
 "LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallito: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: la chiave segreta %08lX NON � protetta.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s non � un set di caratteri valido\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chiave %08lX: impossibile metterla nel trustdb\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chiave %08lX: richiesta del record fallita\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chiave %08lX: gi� nella tabella delle chiavi affidabili\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: la chiave segreta %08lX NON � protetta.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "chiave %08lX: le chiavi segreta e pubblica non corrispondono\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumerate secret keys fallito: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Saltata una revoca dell'user ID valida a causa di una autofirma pi� recente"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Revoca dell'user ID valida"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "certificato doppio - cancellato"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallita: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserito\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "errore durante la lettura del dir record: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record senza chiave - saltato\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu a causa di nuove chiavi pubbliche\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non � nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 
@@ -3364,40 +3343,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3407,49 +3386,49 @@ msgstr ""
 "le firme!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directory creata\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "� necessario eseguire di nuovo GnuPG in modo che possa leggere il nuovo\n"
@@ -3483,23 +3462,23 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "c'� una chiave segreta per questa chiave pubblica!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "� una chaive segreta! - Vuoi cancellarla davvero? "
 
@@ -3750,6 +3729,38 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problema di lettura del certificato: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "In questa versione non possono essere usate chiavi RSA\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Non ci sono chiavi per questo user ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Non ci sono user ID per questa chiave\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "nessun portachiavi pubblico predefinito\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utente non trovato\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Le chiavi RSA sono deprecate; per favore considera di creare una nuova "
+#~ "chiave\n"
+#~ "e usarla in futuro\n"
+
 # ??? (Md)
 #~ msgid "not processed"
 #~ msgstr "non esaminato"
diff --git a/po/ja.po b/po/ja.po
index 0bd30aaa9..78d002ee9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-02-16 20:10+09:00\n"
 "Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -31,7 +31,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
@@ -241,7 +241,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
@@ -293,11 +293,11 @@ msgstr "`%s' �������ޤ���: %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: �����Ǥʤ�����������֤��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -311,7 +311,7 @@ msgstr ""
 "���Υץ������ˤ���������줿�ǡ����ϰ��ڻ��Ѥ��ƤϤ����ޤ���!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +334,7 @@ msgstr "��������줿�����ʥ��꡼��̵�����ˤϼ¹ԤǤ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤ���Ŭ�ڤʥץ��������Ѥ����ΤǤ��礦)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -342,139 +342,139 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[file]|��̾�����"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|���ꥢ��̾�����"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (�ǥե����)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "���ΰ���"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "���������ڥ������"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "��������󥰤��鸰����"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "��̩����󥰤��鸰����"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "��������ˤƸ��˽�̾"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "���ؤν�̾�ޤ����Խ�"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "�˴�����������"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "�������Ф˸�����Ͽ"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "�����ɤ߹���/�ޡ���"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|���ѥǡ����١���������å�"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ����ý���"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ����ò�"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|��å�������������"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -484,158 +484,162 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "�����������������ä�����"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|NAME �Ѥ˰Ź沽"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|�ǥե���Ȥμ����ԤȤ��� NAME ���Ѥ���"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "�ǥե���Ȥμ����ԤȤ��ƥǥե���Ȥθ����Ѥ���"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "��̾������� ���� user-id ���Ѥ���"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���̥�٥�� N �����ꤹ�� (0 ���󰵽�)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "ɸ��ƥ����ȥ⡼�ɤ��Ѥ���"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ����Ѥ���"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "ü������Ѥ��ʤ�"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "����Ū�� v3 ��̾����"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ�� MDC �����"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "���Ƥ��ѹ����Ѥ��ʤ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "�Хå��⡼��: �䤤��碌��Ԥ�ʤ�"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "���Ƥμ���� yes �ȸ��ʤ�"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "���Ƥμ���� no �ȸ��ʤ�"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "����󥰤ΰ����� ���θ���ä���"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "������ ������̩����󥰤�ä���"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|�ǥե���Ȥ���̩���Ȥ��� NAME ���Ѥ���"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|���θ����� ���θ������Ф��Ѥ���"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|ü����ʸ�������ɤ� NAME �����ꤹ��"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "�ե����뤫�饪�ץ������ɤ߹���"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|���� FD �˾��֤�񤭽Ф�"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|��ĥ�⥸�塼�� FILE ���ɤߤ���"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 �˵��Ҥ��줿�⡼�ɤ��Ѥ���"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "���ƤΥѥ��åȤȰŹ�Ƚ�̾�Υ��ץ����� OpenPGP �ο��������"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼���⡼�� N ���Ѥ���"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|�ѥ��ե졼���˥�å��������󥢥르�ꥺ�� NAME ���Ѥ���"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|�ѥ��ե졼���˰Ź楢�르�ꥺ�� NAME ���Ѥ���"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|�Ź楢�르�ꥺ�� NAME ���Ѥ���"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|��å��������󥢥르�ꥺ�� NAME ���Ѥ���"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|NAME|���̥��르�ꥺ�� NAME ���Ѥ���"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "�Ź�ѥ��åȤθ� ID �ե�����ɤ����Ф���"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|��������ǡ������Ѥ���"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +659,15 @@ msgstr ""
 " --list-keys [names]        ����ɽ��\n"
 " --fingerprint [names]      �����ɽ��\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǥ�ݡ��Ȥ����äƲ�������\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +677,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽���ޤ��� ����\n"
 "�ǥե���Ȥ�ư������ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,187 +685,191 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [options] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: �ǥե���ȥ��ץ����ե����� `%s' ������ޤ���\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ����ե����� `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s' ���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ��������ʸ�������ɤǤϤ���ޤ���\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "�ٹ�: �ץ������ϥ����ե������������ޤ�!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: %s ���̾���Ѥ��ޤ���!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �� %s �ȶ����Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s �ȶ����Ѥ��Ƥ��̣������ޤ���!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "Ϳ����줿�ݥꥷ�� URL ��̵���Ǥ�\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ��� %d..%d ���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �� 0 ����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �� 1 ����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth �� 1 ���� 255 ���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ��� S2K �⡼�� (0) �λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵���� S2K �⡼�ɡ�0, 1 �ޤ��� 3 �Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [���ޥ��]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s �������ޤ���: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [�����]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "���ý���˼���: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "���ò��˼���: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�ϥå��奢�르�ꥺ�� `%s' ��̵���Ǥ�\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ʋ����� ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' �������ޤ���\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -869,11 +877,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ��������������(_)�Τߤ��Ѥ���'=' "
 "��ȼ��ʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤ�ʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -958,7 +966,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             ����:"
 
@@ -1183,12 +1191,12 @@ msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�ˤ�äƾ�������Ƥ��ޤ���!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
@@ -1207,34 +1215,34 @@ msgstr "�桼�� ID ������: "
 msgid "No such user ID.\n"
 msgstr "���Υ桼�� ID �Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϥǥե���Ȥμ����Ԥ����ꤵ��Ƥ��ޤ�\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "��������̵�뤷�ޤ�����\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "�����å�: �������ϴ��� --encrypt-to �ˤ����ꤵ��Ƥ��ޤ�\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "�ǥե���Ȥμ����� `%s' �����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ���Υ��顼: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: ��������̵�뤷�ޤ���\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
@@ -1246,58 +1254,58 @@ msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 msgid "writing key binding signature\n"
 msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "���μ�������򤷤Ʋ�����:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA �� ElGamal (�ǥե����)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "�ɤ�����Ӥޤ���? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1310,19 +1318,19 @@ msgstr ""
 "          �ǥե���Ȥθ��������� 1024 �ӥå�\n"
 "                ����θ��������� 2048 �ӥå�\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ������������򤷤ޤ���? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA �θ��������� 512 ���� 1024 �ޤǤǤ�\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
@@ -1335,12 +1343,12 @@ msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "�����������礭�����ޤ�; %d ������Ǥ���\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1348,11 +1356,11 @@ msgstr ""
 "2048 �ʾ�θ��������ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ����������������ɤ��Ǥ���? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1360,21 +1368,21 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�������Ф��� "
 "�������餱�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ʋ�����!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "���ʤ��������ˤ��Τ褦��Ĺ������ɬ�פǤ���? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1390,25 +1398,25 @@ msgstr ""
 "      <n>m = ͭ������ n ��\n"
 "      <n>y = ͭ������ n ǯ\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "����ͭ������? (0)"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "����̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1416,11 +1424,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "������ɤ��Ǥ��� (y/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1436,44 +1444,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "̾���Ͽ����ǻϤޤäƤϤ����ޤ���\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾���� 5 ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "�Żҥ᡼�륢�ɥ쥹: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�륢�ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "����: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "�����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������� `%s' ��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1484,28 +1492,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1513,11 +1521,11 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼����ɬ�פǤ���\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ʋ�������\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1529,7 +1537,7 @@ msgstr ""
 "���ץ����ˤ�äơ����ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1540,29 +1548,29 @@ msgstr ""
 "�ǥ������˥�����������ʤɤ�¾�ι�ư��Ʊ���˹Ԥ��ȡ�����������֤ˤ�\n"
 "�𻨤����礭���ɤ�������������䤹���ʤ�ޤ��Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ���ڥ��� 1024 �ӥåȤˤʤ�ޤ�\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s' �ؤθ����������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s' �ؤ���̩�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����������졢��̾����ޤ�����\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1570,28 +1578,28 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "\"--edit-key\" ���ޥ�ɤ��Ѥ���������������Ƥ���������\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���κ����˼���: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "�����˺������ޤ���? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1602,42 +1610,37 @@ msgstr "%s: �����ޤ���: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���������˼���: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s' �����ɤ߹��ߤޤ�\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s �Ź沽 ������: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: �桼�������Ĥ���ޤ���: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "��������ɤ߹��ߤ˼���: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -1645,262 +1648,251 @@ msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk ����å���Υ���ȥ꡼��¿�����ޤ� - ̵��\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk ����å���Υ���ȥ꡼��¿�����ޤ� - ̵��\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "���ΥС������Ǥ� RSA �����ϻȤ��ޤ���\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "�桼�� ID �θ�������ޤ���\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "���Υ桼�� ID ������ޤ���\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "���� %08lX ����Ѥ��ޤ� - �縰 %08lX ������\n"
 
-#: g10/getkey.c:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "�� %08lX: �������Τʤ���̩���Ǥ��������å�\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: �桼�������Ĥ���ޤ���\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "������ %d �Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu ���ޤǽ���\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s' ���ɤ߹��ߤ˼���: %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "�������ι��: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "            ����������: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         �桼�� ID �ʤ�: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              �ɤ߹���: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �����ʥ桼�� ID: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            ����������: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            �����ʽ�̾: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        �����ʸ����˴�: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ��̩�����ɤ߽Ф�: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      ��̩�����ɤ߹���: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      �ѹ���̵����̩��: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�� %08lX: �桼�� ID ������ޤ���\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�� %08lX: ���ѤǤ���桼�� ID ������ޤ���\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾������Ƥ��ʤ�����Ǥ��礦\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�� %08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "�ǥե���Ȥθ�������󥰤�����ޤ���\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s' �ؤν񤭽Ф�\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "����� `%s' �Υ��å����Ǥ��ޤ���: %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "����� `%s' �ν񤭹��ߤ˼���: %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "�� %08lX: ���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�� %08lX: �桹����ͭ���븰�Ȱۤʤ�ޤ�\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "�� %08lX: ���ꥸ�ʥ�θ��֥��å��˰��֤Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "�� %08lX: ���ꥸ�ʥ�θ��֥��å����ɤ�ޤ���: %s\n"
-
-#: g10/import.c:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "�� %08lX: �����ʥ桼�� ID �� 1 ��\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "�� %08lX: �����ʥ桼�� ID �� %d ��\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "�� %08lX: �����ʽ�̾�� 1 ��\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "�� %08lX: �����ʽ�̾�� %d ��\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "�� %08lX: ������������ 1 ��\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "�� %08lX: ������������ %d ��\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "�� %08lX: �ѹ��ʤ�\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "�� %08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�� %08lX: ������̩����󥰤ˤ���ޤ�\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�� %08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "�� %08lX: ������������ޤ��� - �˴��������Ŭ�Ѥ��Ǥ��ޤ���\n"
 
-#: g10/import.c:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�� %08lX: ̵�����˴�������: %s - ���ݤ��ޤ���\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�� %08lX: �˴���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�� %08lX: ��̾���б�����桼�� ID ������ޤ���\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�� %08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "�� %08lX: ���ʽ�̾��̵���Ǥ�\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�� %08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�� %08lX: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "�� %08lX: �������줿���ʽ�̾����Ƥ��ʤ��桼�� ID '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�� %08lX: �����åפ����桼�� ID '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�� %08lX: �����åפ�������\n"
@@ -1909,104 +1901,99 @@ 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:880
+#: g10/import.c:848
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�� %08lX: �񤭽Ф��ԲĤʽ�̾ (class %02x) - �����å�\n"
 
-#: g10/import.c:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "�� %08lX: �˴������񤬴ְ�ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�� %08lX: ̵�����˴�������: %s - �����å�\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�� %08lX: ��ʣ�����桼�� ID �θ��� - �ɲ�\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�� %08lX: �˴���������ɲ�\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "�� %08lX: �桹�Υ��ԡ��ˤϼ��ʽ�̾������ޤ���\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: �桼�������Ĥ���ޤ���\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[�˴�]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾ 1 ��\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾ %d ��\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "����̵���Τ� 1 �Ĥν�̾�ϸ��ڤǤ��ޤ���\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "����̵���Τ� %d �Ĥν�̾�ϸ��ڤǤ��ޤ���\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "����̵���Τ� 1 �Ĥν�̾�ϸ��ڤǤ��ޤ���\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d �Ĥν�̾�ϥ��顼�ˤ�긡�ڤ���ޤ���\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾��̵���桼�� ID �� 1 �Ĥ���ޤ�\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾��̵���桼�� ID �� %d �Ĥ���ޤ�\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "�� %08lX �ˤ�äƴ��˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "�� %08lX �ˤ�äƽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "������ ���θ��ˤ��ʤ��θ��ǽ�̾�����ɤ��Ǥ���: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2014,34 +2001,34 @@ msgstr ""
 "��̾�Ͻ񤭽Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "��̩��������ޤ���"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ����뤳�ȤϤǤ��ޤ���: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2049,7 +2036,7 @@ msgstr ""
 "������̩�����Ф��뿷�����ѥ��ե졼�������Ϥ��Ʋ�������\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2057,421 +2044,421 @@ msgstr ""
 "�ѥ��ե졼������ɬ�פʤ褦�Ǥ���������ϰ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "���ȥ桼�� ID �ΰ���"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "�桼�� ID N ������"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "���� N ������"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "���˽񤭽Ф��ԲĤʽ�̾"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "�桼�� ID ���ɲ�"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "�桼�� ID �ξõ�"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "�����κ��"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������������ڤ��ؤ�"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "���ʽ�̾���ѹ�"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "��������ԲĤˤ���"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "������ѲĤˤ���"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϼ¹ԤǤ��ޤ���\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ�\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "�����¹Ԥ���ˤ���̩����ɬ�פǤ���\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "���ƤΥ桼�� ID �� ������ ��̾���ޤ���? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "�ҥ��: ��̾����桼�� ID  ������\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "���ʤ��Ȥ� 1 �ĤΥ桼�� ID �����򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�桼�� ID �ν�̾�Ϻ���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤��桼�� ID �� ������ ������ޤ���? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "���Υ桼�� ID �� ������ ������ޤ���? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "���ʤ��Ȥ� 1 �Ĥθ������򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����� ������ ������ޤ���? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "���θ��� ������ ������ޤ���? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤����� ������ �˴����ޤ���? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "���θ��� ������ �˴����ޤ���? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼���: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼���: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "�����ѹ�����Ƥ��ޤ���Τǹ�������ɬ�פϤ���ޤ���\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (\"help\" �򸫤�)\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "���θ��ϻ����ԲĤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "�� %08lX: �������˴��ѤߤǤ�!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        �����ʸ����˴�: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "���������ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�� ������ ������ޤ���? (y/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d �Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d �Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩��������������Ʋ�������\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "¿���Ƥ� 1 �Ĥ����������򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 ����ͭ�����¤��ѹ����뤳�Ȥ��Ǥ��ޤ�\n"
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩����󥰤��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d �֤Υ桼�� ID �Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d �֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "�桼�� ID: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2480,34 +2467,34 @@ msgstr ""
 "\"\n"
 "���ʤ��θ� %08lX �� %s �˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "���ν�̾���Ф����˴��������������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼�� ID �˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX �ˤ�ä� %s �˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX �ˤ�ä� %s ���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "���ʤ��Ϥ����ν�̾���˴����뤫�¤äƤ��ޤ�:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�˴�������� ������ �������ޤ���? (y/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
@@ -2633,29 +2620,16 @@ msgstr "�Ť����� (PGP 2.x) �ˤ���̾\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ����Ф���ޤ���\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "��������פ�̵���ˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "�ٹ�: �ץ������ϥ����ե������������ޤ�!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA "
-"����ȿ�Ф���Ƥ��ޤ�������������������ƺ���Ϥ��θ����Ѥ��뤳�Ȥ�Ƥ���Ƥ��"
-"�����\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ�������Ū����ˡ���Ѥ��Ʋ�����!\n"
 
@@ -2664,7 +2638,7 @@ msgstr "���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ�������Ū����ˡ���Ѥ��Ʋ�����!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ�� %d �ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
@@ -2779,30 +2753,30 @@ msgstr "ɸ�����Ϥ���ɤ߹����� ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ��� `%s' �������ޤ���\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "������μ������ѤǤ�����̩�� %08lX ���Ѥ��ޤ� ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��������μ������ѤǤ���\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK �ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "�ݸ�르�ꥺ�� %d �ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "����: �Ź楢�르�ꥺ�� %d ��ͥ�������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "����: ��̾�θ��ϴ����ڤ�Ǥ� %s\n"
@@ -2841,65 +2815,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "��̩��������ޤ���"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "�ݸ�르�ꥺ�� %d �ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ʋ����� ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤�������Ф���ޤ������ѥ��ե졼�����ѹ����Ʋ�������\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "����� PGP �ˤ�äƺ������줿 ElGamal "
 "���Ǥ������θ��Ͻ�̾���Ѥ���ˤϰ����ǤϤ���ޤ���!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "�������Ͻ�̾���� %lu �ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�������Ͻ�̾���� %lu �ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "����: ��̾�θ��ϴ����ڤ�Ǥ� %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "�����ʥ���ƥ�����ӥåȤ����ä��Τǡ���̾���������ȸ��ʤ��ޤ�\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ��̾����̾��: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s �������Ǥ��ޤ���: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: `%s' �϶��Υե�����Ǥ�\n"
@@ -2938,8 +2912,8 @@ msgstr "%s: ���������Ǥ��ޤ���: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ���񤬤���ޤ���!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: �����Ǥ��ޤ���: %s\n"
@@ -3040,286 +3014,291 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ���\"gpg --fix-trustdb\" ��¹Ԥ��Ʋ�������\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "���ѥ쥳���� %lu, �ꥯ�����ȥ����� %d: �ɤ߽Ф��˼���: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "���ѥ쥳���� %lu, ������ %d: �񤭹��ߤ˼���: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "���ѥ쥳���� %lu: ����˼���: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���ѥǡ����١���: Ʊ���˼���: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "LID %lu �Υǥ��쥯�ȥ�쥳���ɤ��ɤ߽Ф����顼: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: ���Ԥ��줿�ǥ��쥯�ȥ�쥳���ɡ������� %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "LID %lu �μ縰������ޤ���\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "LID %lu �μ縰���ɤ߽Ф����顼: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record �˼���: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "����: ��̩�� %08lX ���ݸ��Ƥ��ޤ���\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "�� %08lX: �������Τʤ���̩���Ǥ��������å�\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s ��������ʸ�������ɤǤϤ���ޤ���\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "�� %08lX: ��̩���ȸ��������б����Ƥ��ޤ���\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "�� %08lX: ���ѥǡ����١�������Ͽ�Ǥ��ޤ���\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "�� %08lX: �����꡼�쥳���ɤ˼���\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "�� %08lX: ���˿��Ѥ��븰��ɽ�ˤ���ޤ�\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "�� %08lX: ���Ѥ��븰�Ȥ��Ƽ�������ޤ�����\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "����: ��̩�� %08lX ���ݸ��Ƥ��ޤ���\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "�� %08lX: ��̩���ȸ��������б����Ƥ��ޤ���\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "��̩���ΰ����˼���: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "�� %08lX.%lu: �������б���ͭ���Ǥ�\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "�� %08lX.%lu: �������б���̵���Ǥ�: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "�� %08lX.%lu: ͭ���ʸ����ѻ�\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "�� %08lX.%lu: ̵���ʸ����˴�: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "�� %08lX.%lu: ͭ�����������˴�\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "ͭ���ʼ��ʽ�̾"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "̵���ʼ��ʽ�̾"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "���������ʽ�̾����Ƥ���Τǡ�ͭ���ʥ桼�� ID ���˴��ϹԤ��ޤ���"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "ͭ���ʥ桼�� ID ���˴�"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "̵���ʥ桼�� ID ���˴�"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "ͭ���ʾ�������˴�"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "ͭ���ʾ�����"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "̵���ʾ�������˴�"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "̵���ʾ�����"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "��̾�쥳���� %lu[%d] �ϸ��ä��쥳���ɤ�ؤ��Ƥ��ޤ���\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "��ʣ���������� - ������ޤ���"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir �˼���: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: �����˼���: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: �����˼���: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: �������ޤ���\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "�ǥ��쥯�ȥ�쥳���ɤ��ɤ߽Ф����顼: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu ����������ޤ���\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu ���ˤϥ��顼������ޤ�\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu �����������ޤ���\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "���֥��å��ΰ����˼���: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: ���ʤ��Υǥ��쥯�ȥ�쥳���� - �����å�\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu �����ʸ�����\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu ���򥹥��åפ��ޤ���\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu ���򹹿����ޤ���\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "���äȡ���������ޤ���\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "���äȡ��桼�� ID ������ޤ���\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: �ǥ��쥯�ȥ�쥳���ɤθ����˼���: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "�� %08lX: ���ѥ쥳���ɤ������˼���: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "�� %08lX.%lu: ���ѥ쥳���ɤ��������ޤ���\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "�� %08lX.%lu: ̤��˺�������Ƥ��ޤ� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "�� %08lX.%lu: %s �Ǵ����ڤ�Ǥ�\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "�� %08lX.%lu: ���Ѥθ��ڤ˼���: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "�桼�� '%s' �����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "���ѥǡ����١������� '%s' �θ����˾㳲: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "�桼�� '%s' �Ͽ��ѥǡ����١�������Ͽ����Ƥ��ޤ��� - �������ޤ���\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "'%s' �ο��ѥǡ����١����ؤ���Ͽ�˼���: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n"
 
@@ -3338,40 +3317,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�᤮�뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ����󥰤�����Ǥ��ޤ���: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ����󥰤�������ޤ���\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ������ä� 2 �ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ���ѹ�����Ƥ��ʤ����Ǥ�\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �Ͽ��������Ǥ�\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "���ΰ�����η�٤������Ʋ�����\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' �򥹥��å�: %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3381,49 +3360,49 @@ msgstr ""
 "���Ǥ������θ��Ͻ�̾���Ѥ���ˤϰ����ǤϤ���ޤ���!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "�ե����� `%s' �ϴ���¸�ߤ��ޤ���"
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "��񤭤��ޤ��� (y/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: �����ʳ�ĥ��\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "�������ե�����̾�����Ϥ��Ʋ�����"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "ɸ����Ϥ˽񤭽Ф��ޤ�\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "��̾���줿�ǡ����� `%s' �ˤ�������ꤷ�ޤ�\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: ���������ץ����ե������������ޤ���\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ���񤬺����Ǥ��ޤ���: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: �����������ޤ���\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
 
@@ -3451,24 +3430,24 @@ msgstr "�夤������������ޤ��� - �Ƽ¹Ԥ��ޤ�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d ���ߤޤ���!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "���θ������ΰ٤���̩��������ޤ�!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "�ޤ������������ˤ� \"--delete-secret-key\" ���ץ���� ���Ѥ��Ʋ�������\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "\"--yes\" ��ȼ��ʤ��Хå��⡼�ɤǤϼ¹ԤǤ��ޤ���\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "���θ��򸰥�󥰤��������ޤ���? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "��̩��������ޤ�! - ������ ������ޤ���? "
 
@@ -3712,6 +3691,38 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "`%s' �ؤΥإ�פϤ���ޤ���"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "��������ɤ߹��ߤ˼���: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "���ΥС������Ǥ� RSA �����ϻȤ��ޤ���\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "�桼�� ID �θ�������ޤ���\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "���Υ桼�� ID ������ޤ���\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "�ǥե���Ȥθ�������󥰤�����ޤ���\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "����� `%s' �Υ��å����Ǥ��ޤ���: %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "�� %08lX: ���ꥸ�ʥ�θ��֥��å����ɤ�ޤ���: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: �桼�������Ĥ���ޤ���\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA "
+#~ "����ȿ�Ф���Ƥ��ޤ�������������������ƺ���Ϥ��θ����Ѥ��뤳�Ȥ�Ƥ���Ƥ��"
+#~ "�����\n"
+
 #~ msgid "not processed"
 #~ msgstr "̤����"
 
diff --git a/po/nl.po b/po/nl.po
index ed012f574..5053733ba 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -29,7 +29,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "einde"
 
@@ -239,7 +239,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -291,11 +291,11 @@ msgstr "kan `%s' niet openen: %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -309,7 +309,7 @@ msgstr ""
 "Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +333,7 @@ msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -341,139 +341,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -483,159 +483,163 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,17 +659,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -675,7 +679,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -683,189 +687,193 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "het eerste teken van een notitienaam moet een letter of laag liggend steepje "
 "zijn\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -873,11 +881,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -964,7 +972,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
@@ -1199,12 +1207,12 @@ msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
@@ -1225,37 +1233,37 @@ msgstr "Geef de gebruikersidentificatie: "
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
 
 # fixme
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
 
 # fixme
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
@@ -1267,58 +1275,58 @@ msgstr "zelfondertekening wegschrijven\n"
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1331,19 +1339,19 @@ msgstr ""
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1356,12 +1364,12 @@ msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1369,11 +1377,11 @@ msgstr ""
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1381,21 +1389,21 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1411,26 +1419,26 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1438,11 +1446,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1458,44 +1466,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1506,28 +1514,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1535,11 +1543,11 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1551,7 +1559,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1564,29 +1572,29 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1595,12 +1603,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1608,7 +1616,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1616,11 +1624,11 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1631,42 +1639,37 @@ msgstr "%s: kon niet openen: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: gebruiker niet gevonden: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "leesprobleem voor certificaat: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets ge�xporteerd\n"
 
@@ -1674,266 +1677,256 @@ msgstr "LET OP: er is niets ge�xporteerd\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Geen sleutel voor gebruikersidentificatie\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Geen gebruikersidentificatie voor sleutel\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: gebruiker niet gevonden\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "nieuwe subsleutels: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "ge�mporteerd: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels ge�mporteerd: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "geen standaard openbare sleutelbos\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1942,86 +1935,81 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: gebruiker niet gevonden\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2029,17 +2017,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2047,7 +2035,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2055,34 +2043,34 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2090,7 +2078,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2098,421 +2086,421 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 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:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 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:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2521,34 +2509,34 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 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:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
@@ -2675,28 +2663,16 @@ msgstr "oude stijl (PGP 2.x) ondertekening\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
-"nieuwe sleutel om in de toekomst te gebruiken\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
@@ -2705,7 +2681,7 @@ msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -2819,30 +2795,30 @@ msgstr "lezen uit standaard invoer ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okee, wij zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "oude codering van de DEK wordt niet ondersteund.\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
@@ -2881,67 +2857,67 @@ msgstr "versturen naar `%s' gelukt (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
 "opnieuw.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
 "ondertekeningen!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
@@ -2981,8 +2957,8 @@ msgstr "%s: kan er niet bij: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan hem niet aanmaken: %s\n"
@@ -3084,291 +3060,295 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "vertrouwensveld %lu, req type %d: lezen mislukte: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "vertrouwensveld %lu, type %d: schrijven mislukte: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "vertrouwensveld %lu: verwijderen mislukte: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "vertrouwensdatabase: synchronisatie mislukte: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "fout tijdens lezen van indexveld voor LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: verwachtte indexveld, kreeg type %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "geen pimaire sleutel voor LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "fout tijdens het lezen van primaire sleutel voor LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record mislukte: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
-"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ongeldig sleutelnummer\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "sleutel %08lX: kan niet toevoegen aan de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "sleutel %08lX: opvragen van veld mislukte\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "sleutel %08lX: reeds aanwezig in de betrouwbare sleutel-tabel\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "sleutel %08lX: geaccepteerd als een betrouwbare sleutel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "sleutel %08lX: geheime en openbare sleutel horen niet bij elkaar\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "nummeren van de geheime sleutels mislukte: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "sleutel %08lX.%lu: Foutieve subsleutelbinding: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige sleutelterugtrekking\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "sleutel %08lX.%lu: Ongeldige sleutelterugtrekking: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Correcte zelfondertekening"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Ongeldige zelfondertekening"
 
 # User ID onvertaald
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Geldig terugtrekkingscertificaat overgeslagen wegens een nieuwere "
 "zelfondertekening"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Geldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Ongeldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Geldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Correct certificaat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Ongeldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Ongeldig certificaat"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "ondert. veld %lu[%d] wijst naar een verkeerd veld.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "dubbel certificaat - verwijderd"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir mislukte: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ingevoegd\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fout bij het lezen van indexveld: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "        %lu sleutels met fouten\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "        %lu sleutels ingevoegd\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: indexveld zonder sleutel - overgeslagen\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "        %lu vanwege nieuwe openbare sleutels\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "        %lu sleutels overgeslagen\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "        %lu sleutels bijgewerkt\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooeeps, geen sleutels\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooeeps, geen gebruikersidentificaties\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: zoeken naar indexveld mislukte: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "sleutel %08lX: invoegen van vertrouwensveld mislukte: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "sleutel %08lX.%lu: ingevoegd in de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "sleutel %08lX.%lu: aangemaakt in de toekomst (tijdsverschuiving of "
 "klokprobleem)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "sleutel %08lX.%lu: vervallen op %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "sleutel %08lX.%lu: betrouwbaarheidscontrole mislukt: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "kon `%s' niet opzoeken in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "gebruiker '%s' komt niet voor in de vertrouwensdatabase - invoegen\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
 
@@ -3387,40 +3367,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de onveranderde\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Dicht dit mogelijke beveiligingsgat\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3430,49 +3410,49 @@ msgstr ""
 "niet veilig genoeg voor ondertekeningen!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Bestand `%s' bestaat al. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Overschrijven (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: onbekend achtervoegsel\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Geef een nieuwe bestandsnaam"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "naar standaard uitvoer schrijven\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "ik neem aan dat de getekende gegevens zich in `%s' bevinden\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: nieuw optiebestand aangemaakt\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan map niet aamaken: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: map aangemaakt\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "u moet GnuPG opnieuw starten, zodat het het nieuwe optiebestand kan inlezen\n"
@@ -3505,24 +3485,24 @@ msgstr ""
 "kon het aanmaken van een zwakke sleutel voor het symmetrische\n"
 "algoritme niet voorkomen; ik heb het %d keer geprobeerd!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Deze sleutel van de sleutelbos verwijderen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
@@ -3776,6 +3756,37 @@ msgstr "Geen hulp beschikbaar"
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "leesprobleem voor certificaat: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Geen sleutel voor gebruikersidentificatie\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Geen gebruikersidentificatie voor sleutel\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "geen standaard openbare sleutelbos\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: gebruiker niet gevonden\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
+#~ "nieuwe sleutel om in de toekomst te gebruiken\n"
+
 #~ msgid "not processed"
 #~ msgstr "niet behandeld"
 
diff --git a/po/pl.po b/po/pl.po
index 50984d991..41ed74ef2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 1999-12-05 21:29+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "wyj�cie"
 
@@ -249,7 +249,7 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
@@ -301,13 +301,13 @@ msgstr "nie mo�na otworzy� %s: %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 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:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -321,7 +321,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -345,7 +345,7 @@ msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dla tego zadania)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -353,139 +353,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "tylko zapis do pliku"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "import/do��czanie kluczy"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -495,158 +495,162 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "plik wynikowy b�dzie w opakowaniu ASCII"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zgodno�� ustawie� pakiet�w, szyfr�w i skr�t�w z OpenPGP"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,15 +671,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -685,7 +689,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -693,187 +697,191 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od litery lub podkre�lenia\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,11 +889,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -970,7 +978,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
@@ -1204,12 +1212,12 @@ msgstr ""
 "             Nie ma pewno�ci �e ten podpis zosta� z�o�ony przez "
 "w�a�ciciela.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: klucz publiczny ju� znajduje si� w bazie\n"
@@ -1230,34 +1238,34 @@ msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z uzycia.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pomini�ty: klucz publiczny ju� wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy�lny adresat '%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ycia\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1269,58 +1277,58 @@ msgstr "zapis podpisu klucza nim samym\n"
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Czy na pewno chcesz stworzy� klucz do szyfrowania i podpisywania? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1333,19 +1341,19 @@ msgstr ""
 "               domy�lny rozmiar klucza wynosi 1024 bity\n"
 "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
@@ -1358,12 +1366,12 @@ msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du�y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1371,11 +1379,11 @@ msgstr ""
 "Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� obliczenia\n"
 "trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1383,21 +1391,21 @@ msgstr ""
 "Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
 "komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1413,25 +1421,25 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1439,11 +1447,11 @@ msgstr ""
 "Tw�j system nie potrafi poprawnie wy�wietla� dat po roku 2036.\n"
 "Jednak�e poprawnie obs�ugiwane s� daty do roku 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1459,44 +1467,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <tzb@provider.com.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "to nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1507,46 +1515,46 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej�� (D)alej czy (W)yj�� z programu? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
 "pr�bie;\n"
 "spr�buj jeszcze raz.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1558,7 +1566,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1572,29 +1580,29 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci entropii. "
 "\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 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:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapis certyfikatu publicznego w '%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapis tajnego certyfikatu w '%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "klucze publiczny i tajny zosta�y stworzone i podpisane.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1602,12 +1610,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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1615,7 +1623,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1623,11 +1631,11 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1638,42 +1646,37 @@ msgstr "%s: nie mo�na otworzy�: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: nie znaleziono u�ytkownika: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "b��d przy odczycie certyfikatu: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, 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:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
@@ -1681,267 +1684,256 @@ msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "W tej wersji nie mo�na u�ywa� kluczy RSA\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Brak klucza z takim identyfikatorem u�ytkownika.\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "            nowych podkluczy: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "brak domy�lnego zbioru kluczy publicznych\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "b��d zapisu zbioru kluczy '%': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny do��czony do zbioru\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, 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:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
 "%s - odrzucony\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, 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:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1950,83 +1942,78 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, 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:997
+#: g10/import.c:965
 #, 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:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: nie znaleziono u�ytkownika\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2034,17 +2021,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2052,7 +2039,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz\n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2060,34 +2047,34 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "klucz tajny nie jest dost�pny"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2095,7 +2082,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2103,422 +2090,422 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "przeniesienie podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "�ledzenie"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ycia"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "klucz %08lX: podklucz zosta� uniewa�niony!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2527,34 +2514,34 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez ciebie:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   podpisany kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
@@ -2683,28 +2670,16 @@ msgstr "podpis starego typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
-"wygenerowaniu odpowiednich kluczy.\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj�cy jest odradzany; prosz� u�ywa� bardziej "
@@ -2715,7 +2690,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2832,30 +2807,30 @@ msgstr "odczyt ze strumienia standardowego wej�cia...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; pr�ba klucza tajnego %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
@@ -2894,69 +2869,69 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "klucz tajny nie jest dost�pny"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyra�enie przej�ciowe (has�o); prosz� spr�bowa� ponownie ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
 "             wyra�enie przej�ciowe (has�o).\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
 "nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
@@ -2995,8 +2970,8 @@ msgstr "%s: dost�p niemo�liwy: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mo�na utworzy�: %s\n"
@@ -3097,289 +3072,295 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: odczyt nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "wpis zaufania %lu: usuni�cie nie powiod�o si� %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "b��d odczytu wpisu katalogowego dla LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: oczekiwany wpis katalogowy, napotkano typ %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "brak klucza g��wnego dla LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "b��d odczytu g��wnego klucza dla LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "'%s\" nie jest w�a�ciwym identyfikatorem klucza\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "klucz %08lX: wpisanie do bazy zaufania niemo�liwe\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "klucz %08lX: wyszukanie zapisu nie powiod�o si�\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "klucz %08lX: ju� znajduje si� w tablicy kluczy zaufanych\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr ""
+"klucz %08lX: brak klucza publicznego dla klucza zaufanego - pomini�ty\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "wyliczenie kluczy tajnych nie powiod�o si� %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi�zanie podklucza\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi�zanie podklucza %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie klucza\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "klucz %08lX.%lu: Niew�a�ciwe uniewa�nienie klucza: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie podklucza\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Poprawne uniewa�nienie identyfikatora u�ytkownika pomini�te z powodu\n"
 "nowszego podpisu tym samym kluczem"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Poprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "zapis o podpisach %lu[%d] wskazuje na z�y wpis.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "podw�jny certyfikat - usuni�ty"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiod�a si�: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "b��d podczas odczytu wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z b��dami\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie blok�w kluczy nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: wpis katalogowy bez bloku klucza - pomini�ty\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu z powodu nowych kluczy publicznych\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikator�w u�ytkownik�w\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: poszukiwanie wpisu katalogowego nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przysz�o�ci (zaburzenia czasoprzestrzeni,\n"
 "lub �le ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres wa�no�ci up�yn�� %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b��d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w bazie zaufania nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
@@ -3398,40 +3379,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�ciowa %u jest zbyt d�uga lub brakuje jej zako�czenia\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa.\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pomini�ty '%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3441,49 +3422,49 @@ msgstr ""
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik '%s' ju� istnieje. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "musisz uruchomi� GnuPG od nowa aby wczyta� nowe ustawienia\n"
 
@@ -3514,23 +3495,23 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "dla tego klucza publicznego istnieje klucz tajny!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "nale�y najpierw go usun�� opcj� \"--delete-secret-key\".\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "nie dzia�a w trybie wsadowym bez opcji \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "To jest klucz tajny - czy na pewno go usun��? "
 
@@ -3783,6 +3764,40 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "b��d przy odczycie certyfikatu: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "W tej wersji nie mo�na u�ywa� kluczy RSA\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Brak klucza z takim identyfikatorem u�ytkownika.\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "brak domy�lnego zbioru kluczy publicznych\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
+
+#~ msgid "error writing keyring `%s': %s\n"
+#~ msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
+#~ "wygenerowaniu odpowiednich kluczy.\n"
+
 #~ msgid "not processed"
 #~ msgstr "nie przetworzony"
 
@@ -3823,9 +3838,6 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "nie mo�na zablokowa� zbioru kluczy publicznych: %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "b��d zapisu zbioru kluczy '%': %s\n"
-
 #~ msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 #~ msgstr ""
 #~ "UWAGA: wpis podpisu %lu[%d] znajduje si� w li�cie domy�lnej %lu,\n"
@@ -4073,16 +4085,9 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "usage: gpgm [options] "
 #~ msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#~ msgid "|KEYID|ulimately trust this key"
-#~ msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
-
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "powi�zany rekord podpisu %lu ma niew�a�ciwego w�a�ciciela\n"
 
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr ""
-#~ "klucz %08lX: brak klucza publicznego dla klucza zaufanego - pomini�ty\n"
-
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "lid %lu: odczyt wpisu katalogowego nie powi�d� si�: %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9ad3016c7..4a32a6f7b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -34,7 +34,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
@@ -245,7 +245,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -297,11 +297,11 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -315,7 +315,7 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +339,7 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -347,144 +347,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -494,175 +494,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 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/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +686,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +704,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,190 +712,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVISO: O programa pode criar um arquivo core!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, 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/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, 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/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -899,12 +907,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 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"
 
@@ -989,7 +997,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1218,12 +1226,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1244,34 +1252,34 @@ msgstr "Digite o identificador de usu�rio: "
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave p�blica j� marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1284,58 +1292,58 @@ msgstr "escrevendo auto-assinatura\n"
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voc� realmente quer criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1348,19 +1356,19 @@ msgstr ""
 "              tamanho padr�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
@@ -1373,12 +1381,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1386,11 +1394,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
 "porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1398,21 +1406,21 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado tamb�m "
 "� vulner�vel a ataques!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Voc� realmente precisa de uma chave t�o grande? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1428,25 +1436,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1454,11 +1462,11 @@ msgstr ""
 "Seu sistema n�o consegue mostrar datas al�m de 2038.\n"
 "Apesar disso, elas ser�o corretamente manipuladas at� 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1474,44 +1482,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1522,28 +1530,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1551,11 +1559,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1567,7 +1575,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1579,29 +1587,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1609,12 +1617,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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1622,7 +1630,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1630,11 +1638,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1645,42 +1653,37 @@ msgstr "%s: imposs�vel abrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: usu�rio n�o encontrado: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "erro de leitura do certificado: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1688,264 +1691,253 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de usu�rio\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de usu�rio para chave\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novas subchaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, 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:419
-msgid "no default public keyring\n"
-msgstr "sem chaveiro p�blico padr�o\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "erro na escrita do chaveiro `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
+msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, 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:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, 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:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, 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:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, 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:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1954,98 +1946,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, 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:997
+#: g10/import.c:965
 #, 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:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: usu�rio n�o encontrado\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2053,7 +2040,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2061,34 +2048,34 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2096,7 +2083,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2104,422 +2091,422 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 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:824
+#: g10/keyedit.c:815
 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:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 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:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2528,34 +2515,34 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2681,28 +2668,16 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVISO: O programa pode criar um arquivo core!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
-"us�-la no futuro\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia � depreciado; por favor use algum\n"
@@ -2713,7 +2688,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2827,30 +2802,30 @@ msgstr "lendo de \"stdin\" ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
@@ -2889,65 +2864,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -2986,8 +2961,8 @@ msgstr "%s: imposs�vel acessar: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3089,289 +3064,294 @@ msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "erro lendo registro de diret�rio para LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: registro de diret�rio esperado, tipo %d recebido\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "nenhuma chave prim�ria para LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erro lendo chave prim�ria para LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
 #: g10/trustdb.c:502
 #, c-format
-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"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr ""
 "chave %08lX: imposs�vel coloc�-la no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chave %08lX: pedido de registro falhou\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chave %08lX: j� est� na tabela de chaves confi�veis\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chave %08lX: aceita como chave confi�vel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+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"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave inv�lida: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave v�lida\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave inv�lida: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Auto-assinatura v�lida"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inv�lida"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revoga��o v�lida de ID de usu�rio ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Revoga��o de ID de usu�rio v�lida"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Revoga��o de ID de usu�rio inv�lida"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Certificado de revoga��o v�lido"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revoga��o inv�lido"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Certificado inv�lido"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro lendo registro de diret�rio: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de diret�rio sem chave - ignorado\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves p�blicas\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usu�rio\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registro de diret�rio falhou: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verifica��o de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usu�rio `%s' n�o encontrado no banco de dados de confiabilidade - inserindo\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
@@ -3390,40 +3370,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: imposs�vel criar chaveiro: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3433,49 +3413,49 @@ msgstr ""
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "voc� deve reiniciar o GnuPG, para que ele possa ler o novo arquivo\n"
@@ -3509,23 +3489,23 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
@@ -3772,6 +3752,40 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "erro de leitura do certificado: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Nenhuma chave para identificador de usu�rio\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Nenhum identificador de usu�rio para chave\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "sem chaveiro p�blico padr�o\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
+
+#~ msgid "error writing keyring `%s': %s\n"
+#~ msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: usu�rio n�o encontrado\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
+#~ "us�-la no futuro\n"
+
 #~ msgid "not processed"
 #~ msgstr "n�o processado(s)"
 
@@ -3897,9 +3911,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "imposs�vel bloquear chaveiro `%': %s\n"
 
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "erro na escrita do chaveiro `%': %s\n"
-
 #~ msgid "can't open file: %s\n"
 #~ msgstr "imposs�vel abrir arquivo: %s\n"
 
@@ -3944,10 +3955,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
 #~ msgstr "sigrec em cadeia %lu possui dono errado\n"
 
 #, fuzzy
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-
-#, fuzzy
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "lid %lu: leitura de registro de diret�rio falhou: %s\n"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 297b3e17d..461086ee1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\n"
@@ -32,7 +32,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
@@ -242,7 +242,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -294,11 +294,11 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -312,7 +312,7 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +335,7 @@ msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -343,140 +343,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,175 +486,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 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/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,15 +678,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +696,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,190 +704,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "AVISO: O programa pode criar um ficheiro core!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, 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/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, 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/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -891,12 +899,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 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"
 
@@ -981,7 +989,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1211,12 +1219,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1237,34 +1245,34 @@ msgstr "Digite o identificador de utilizador: "
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: a chave p�blica j� colocada com --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1277,58 +1285,58 @@ msgstr "escrevendo auto-assinatura\n"
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encrip��o)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encripta��o)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encripta��o)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voc� quer realmente criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1341,19 +1349,19 @@ msgstr ""
 "         tamanho por omiss�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
@@ -1366,12 +1374,12 @@ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1379,11 +1387,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
 "porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1391,21 +1399,21 @@ msgstr ""
 "Tudo bem, mas n�o se esque�a que a radia��o do seu monitor e teclado tamb�m "
 "� extremamente vulner�vel a ataques!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Voc� precisa realmente de uma chave t�o grande? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1421,25 +1429,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1447,11 +1455,11 @@ msgstr ""
 "O seu sistema n�o consegue mostrar datas para al�m de 2038.\n"
 "No entanto, estas v�o ser tratadas correctamente at� 2106.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1468,44 +1476,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o pode come�ar com um d�gito\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1516,28 +1524,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)ndere�o ou (O)k/(S)air? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1545,11 +1553,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1561,7 +1569,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1573,29 +1581,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1603,12 +1611,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para encripta��o. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1616,7 +1624,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1624,11 +1632,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1639,42 +1647,37 @@ msgstr "%s: imposs�vel abrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: utilizador n�o encontrado: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "erro de leitura do certificado: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1682,264 +1685,253 @@ msgstr "AVISO: nada exportado\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de utilizador\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de utilizador para chave\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utilizador n�o encontrado\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "           novas subchaves: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 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:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, 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:419
-msgid "no default public keyring\n"
-msgstr "sem porta-chaves p�blico padr�o\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, 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:670
+#: g10/import.c:643
 #, 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:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, 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:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, 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:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1948,98 +1940,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, 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:897
+#: g10/import.c:865
 #, 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:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utilizador n�o encontrado\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2047,7 +2034,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2055,34 +2042,34 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2090,7 +2077,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2098,422 +2085,422 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 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:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualiza��o da base de dados de confian�a falhou: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 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:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 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:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2522,34 +2509,34 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 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:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2675,28 +2662,16 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "AVISO: O programa pode criar um ficheiro core!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
-"us�-la no futuro\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia n�o � recomendado;\n"
@@ -2707,7 +2682,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2820,30 +2795,30 @@ msgstr "lendo do \"stdin\" ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de protec��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
@@ -2882,65 +2857,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de protec��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -2979,8 +2954,8 @@ msgstr "%s: imposs�vel aceder: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3082,288 +3057,293 @@ msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registo de confian�a %lu, tipo req %d: falha na leitura: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registo de confian�a %lu: remo��o falhou: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "erro lendo registo de direct�rio para LID %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: registo de direct�rio esperado, tipo %d recebido\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "nenhuma chave prim�ria para LID %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "erro ao ler chave prim�ria para LID %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
 #: g10/trustdb.c:502
 #, c-format
-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"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "chave %08lX: imposs�vel coloc�-la na base de dados de confian�a\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "chave %08lX: pedido de registo falhou\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "chave %08lX: j� est� na tabela de chaves confi�veis\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "chave %08lX: aceite como chave confi�vel.\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+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"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave inv�lida: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave v�lida\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave inv�lida: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Auto-assinatura v�lida"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inv�lida"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revoga��o v�lida de ID de utilizador ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Revoga��o de ID de utilizador v�lida"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Revoga��o de ID de utilizador inv�lida"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Certificado de revoga��o v�lido"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revoga��o inv�lido"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Certificado inv�lido"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registo de assinatura %lu[%d] aponta para registo errado.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro ao ler registo de direct�rio: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registo de direct�rio sem chave - ignorado\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves p�blicas\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registo de direct�rio falhou: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inser��o de registo de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida na base de dados de confian�a\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verifica��o de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' na base de dados de confian�a: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "utilizador `%s' n�o encontrado na base de dados de confian�a - a inserir\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' na base de dados de confian�a: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
 
@@ -3382,40 +3362,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: imposs�vel criar porta-chaves: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3425,49 +3405,49 @@ msgstr ""
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de op��es criado\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directoria criada\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "vai ter de reiniciar o GnuPG, para poder ler as novas op��es\n"
 
@@ -3499,23 +3479,23 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-key\" para a apagar primeiro.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
@@ -3761,6 +3741,37 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "erro de leitura do certificado: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Nenhuma chave para identificador de utilizador\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Nenhum identificador de utilizador para chave\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "sem porta-chaves p�blico padr�o\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utilizador n�o encontrado\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
+#~ "us�-la no futuro\n"
+
 #~ msgid "not processed"
 #~ msgstr "n�o processado"
 
diff --git a/po/ru.po b/po/ru.po
index 7f5de3fca..a00fcc0e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -37,7 +37,7 @@ msgstr ""
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "�����"
 
@@ -293,7 +293,7 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
@@ -345,12 +345,12 @@ msgstr "���������� ������� ���� `%s': %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "��������: ������������ ���������� ��������� ��������� �����!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -364,7 +364,7 @@ msgstr ""
 "�� ����������� ������� ���������� ���� ����������!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -390,7 +390,7 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -398,147 +398,147 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -548,168 +548,172 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "������������"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 #, fuzzy
 msgid ""
 "@\n"
@@ -730,17 +734,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -750,7 +754,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -758,203 +762,207 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/gpg.c:1057
+#: g10/gpg.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:1064
+#: g10/gpg.c:1078
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1041,7 +1049,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1270,12 +1278,12 @@ msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
@@ -1297,35 +1305,35 @@ msgstr "������� ������������� ������������: "
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, fuzzy, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1337,59 +1345,59 @@ msgstr "������� ����-�������\n"
 msgid "writing key binding signature\n"
 msgstr "������� \"key-binding\" �������\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "����������� ���� ����� ����� %u ���\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������� �� %u ���\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� �����:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA � ElGamal (�� ���������)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (������ �������)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (������ ����������)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (������� � ����������)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (������� � ����������)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "��� �����? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "������������ �����.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1402,19 +1410,19 @@ msgstr ""
 "               ����� ����� �� ���������: 1024 ����\n"
 " ������������ ������������� ����� �����: 2048 ���\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "������ ������� ���� �� �������? (1024)"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "���������� ������ DSA ������ - �� 512 �� 1024 ���\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
@@ -1427,12 +1435,12 @@ msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1441,11 +1449,11 @@ msgstr ""
 "����� ������ ������ 2048 �� �������������, ������ ��� ������������������ "
 "����� ����� �������!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "�� ������������� ������ ���� ����� �����? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1453,21 +1461,21 @@ msgstr ""
 "��, ������ �� ���������, ��� ��������� ����� ���������� � �������� ����\n"
 "������ ��� �������� ��� ����.\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "��� ������������� ����� ����� ������� ����? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "����������� ���� ����� ����� %u ���\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "��������� �� %u ���\n"
 
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1483,35 +1491,35 @@ msgstr ""
 "      <n>m = ���� �������� ����� n �������\n"
 "      <n>y = ���� �������� ����� n ���\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "���� ������������ � �������? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "������������ ��������.\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "���������� ����.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "���� ��������� �� %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "��� �����? (y/n) "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1527,44 +1535,44 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "���� ��� (\"��� �������\"): "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "������������ ������ � �����\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "������ ��� �� ����� ���������� � �����.\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "������������ E-Mail\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "�����������: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1575,29 +1583,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
 
-#: g10/keygen.c:982
+#: g10/keygen.c:983
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
 
-#: g10/keygen.c:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1605,11 +1613,11 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1621,7 +1629,7 @@ msgstr ""
 "�����, �������� ��� ��������� � ���������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1634,30 +1642,30 @@ msgstr ""
 "��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n"
 "����� ����������� ������� ���������� ��������.\n"
 
-#: g10/keygen.c:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "��������� ����� ��������: %s\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "�������� � ��������� ����� ������� � ���������.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1668,12 +1676,12 @@ msgstr ""
 "���������������\n"
 "����� ��� ����������.\n"
 
-#: g10/keygen.c:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1681,7 +1689,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1689,12 +1697,12 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 #, fuzzy
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1705,42 +1713,37 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� �������� �������� �����: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� �� `%s'\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ����������� ���: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, fuzzy, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr ""
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, fuzzy, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 #, fuzzy
 msgid "WARNING: nothing exported\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
@@ -1749,266 +1752,253 @@ msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr ""
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-#, fuzzy
-msgid "No key for user ID\n"
-msgstr "���� %08lX: ��� �������������� ������������\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-#, fuzzy
-msgid "No user ID for key\n"
-msgstr "������ ��������� ����"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
 
-#: g10/getkey.c:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, fuzzy, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "���������� ���� ���� %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "���� %08lX: %d ����� ��������\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, fuzzy, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, fuzzy, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "��� ����� ���� ������� ����������� ����-�������\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "��� ������ �������� ������ �� ���������\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, fuzzy, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "���������� ������������� ������ �������� ������: %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
 #, fuzzy, c-format
-msgid "error writing keyring `%s': %s\n"
+msgid "error writing key: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "���� %08lX: �������� ���� ������������\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���� %08lX: �� ��������� � ����� ������\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 
-#: g10/import.c:466 g10/import.c:659
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
-
-#: g10/import.c:493
+#: g10/import.c:484
 #, fuzzy, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "���� %08lX: 1 ����� ������������� ������������\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, fuzzy, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "���� %08lX: %d ����� ��������������� �������������\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "���� %08lX: 1 ����� �������\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "���� %08lX: %d ����� ���-������\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
 "����������\n"
 
-#: g10/import.c:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "���� %08lX: ���������� ���������� ������������\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, fuzzy, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:803
+#: g10/import.c:771
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -2017,86 +2007,81 @@ msgstr "���� %08lX: 1 ����� ���-����\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:880
+#: g10/import.c:848
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: ������������ �� ������\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 #, fuzzy
 msgid "[self-signature]"
 msgstr "[����-�������]\n"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 #, fuzzy
 msgid "1 bad signature\n"
 msgstr "1 ������ �������\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 #, fuzzy
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ������� �� ��������� ��-�� ���������� �����\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, fuzzy, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%s �������� �� ��������� ��-�� ���������� ������\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 #, fuzzy
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%s �������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 #, fuzzy
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "��������� 1 ������������� ������������ ��� ���������� ����-�������\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, fuzzy, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2104,57 +2089,57 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, fuzzy, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��� ��������� ������ %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, fuzzy, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 #, fuzzy
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�� ������������� �������, ��� ������ ��������� ���� ���� �����:\n"
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "������������� ���������? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "������ ������������: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "��������� ���� �� ����������"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "���� ���� �������.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���������� ������������� ���� ����: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2162,7 +2147,7 @@ msgstr ""
 "������� ����� �������� ����� ��� ����� ���������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2170,499 +2155,499 @@ msgstr ""
 "�� �� ������ �������� ����� - ��� ������ ����� *������* ����!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "�� ������������� ����� ������? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "����� �� ����"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "��������"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "�������� � �����"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "������"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "�������� ������"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 #, fuzzy
 msgid "show fingerprint"
 msgstr "�������� \"��������� ������\""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 #, fuzzy
 msgid "list"
 msgstr "������"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 #, fuzzy
 msgid "list key and user IDs"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 #, fuzzy
 msgid "select user ID N"
 msgstr "������� ������������� ������������ N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "����"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "������� �������������� ���� N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "��������"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 #, fuzzy
 msgid "list signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "���������"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "sign the key"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 #, fuzzy
 msgid "lsign"
 msgstr "���������"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 #, fuzzy
 msgid "sign the key locally"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "�������"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 #, fuzzy
 msgid "add a user ID"
 msgstr "�������� ������������� ������������"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 #, fuzzy
 msgid "delete user ID"
 msgstr "������� ������������� ������������"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "add a secondary key"
 msgstr "�������� �������������� ����"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "delsig"
 msgstr "���������"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "delete signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "change the expire date"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "����������� ����� ������� ��������� � �������� ������"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 #, fuzzy
 msgid "change the passphrase"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "�������� ��������� �������"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 #, fuzzy
 msgid "revsig"
 msgstr "���������"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 #, fuzzy
 msgid "revoke signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 #, fuzzy
 msgid "revkey"
 msgstr "����"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 #, fuzzy
 msgid "disable a key"
 msgstr "������ ����"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 #, fuzzy
 msgid "enable a key"
 msgstr "������ ����"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "������� ��������� ����.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 #, fuzzy
 msgid "Command> "
 msgstr "�������> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "����� ��� �������, ����� ��������� ����.\n"
 
-#: g10/keyedit.c:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 #, fuzzy
 msgid "Really sign all user IDs? "
 msgstr "������������� ��������� ��� �������������� ������������? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "���������: �������� �������������� ������������ ������� ������ ���������\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 #, fuzzy
 msgid "You must select at least one user ID.\n"
 msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 #, fuzzy
 msgid "You can't delete the last user ID!\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 #, fuzzy
 msgid "Really remove all selected user IDs? "
 msgstr "������������� ������� ��� ��������� �������������� ������������? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 #, fuzzy
 msgid "Really remove this user ID? "
 msgstr "������������� ������� ���� ������������� ������������? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "��������� ���������? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "����� ��� ����������? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 msgid "Key not changed so no update needed.\n"
 msgstr "���� �� ���������, ���������� �� �����.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "������������ ������� (���������� \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, fuzzy, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� �������������� ������������ � �������� %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ��������������� ����� � �������� %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 #, fuzzy
 msgid "user ID: \""
 msgstr "������� ������������� ������������: "
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "������������� ���������� ����������"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1766
 #, fuzzy
 msgid "You have signed these user IDs:\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, fuzzy, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "You are about to revoke these signatures:\n"
 msgstr "M�chten Sie einige der ung�ltigen Signaturen entfernen? "
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 #, fuzzy
 msgid "no secret key\n"
 msgstr "������ ��������� ����"
@@ -2794,28 +2779,16 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr ""
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"����������� RSA ������� �� �������������, ����������, ��������� � ��������\n"
-"������ ����� ��� ������������� � �������\n"
-
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2824,7 +2797,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2956,32 +2929,32 @@ msgstr ""
 msgid "can't open signed data `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "��������� ����������, ������� ��������� ���� %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 #, fuzzy
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��, �� -- ��������� ����������.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 #, fuzzy
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, fuzzy, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "���������: ������������ �������� %d �� ������ � �������������\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
@@ -3020,65 +2993,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "��������� ���� �� ����������"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, fuzzy, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "������������ �������� �����, ���������� ����� ...\n"
 
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, fuzzy, c-format
 msgid "%s signature from: %s\n"
 msgstr "������ ������� �� \""
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 #, fuzzy
 msgid "signing:"
 msgstr "���������"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, fuzzy, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
@@ -3117,8 +3090,8 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -3219,296 +3192,301 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "���� ������ ������� ���������: ��������� \"gpgm --fix-trust-db\".\n"
 
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, fuzzy, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, fuzzy, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, fuzzy, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr ""
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr ""
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, fuzzy, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, fuzzy, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:487
-#, fuzzy, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "���� ���� �� �������.\n"
-
-#: g10/trustdb.c:495
+#: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
+msgid "'%s' is not a valid long keyID\n"
+msgstr "������������ ������ � �����������.\n"
 
 #: g10/trustdb.c:502
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "���� %08lX: ��������� � ��������� ����� �� ���������.\n"
-
-#: g10/trustdb.c:514
 #, fuzzy, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "���� %08lX.%lu: ���������� �������� � ���� ������ �������\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, fuzzy, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "���� %08lX: ������ ������ �� ������\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, fuzzy, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, fuzzy, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
+
+#: g10/trustdb.c:566
+#, fuzzy, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "���� ���� �� �������.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "���� %08lX: ��������� � ��������� ����� �� ���������.\n"
+
+#: g10/trustdb.c:598
 #, fuzzy, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 #, fuzzy
 msgid "Good self-signature"
 msgstr "[����-�������]\n"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 #, fuzzy
 msgid "Invalid self-signature"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 #, fuzzy
 msgid "Valid user ID revocation"
 msgstr "������������ �����.\n"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "������������ �����.\n"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 #, fuzzy
 msgid "Valid certificate revocation"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 #, fuzzy
 msgid "Good certificate"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 #, fuzzy
 msgid "Invalid certificate revocation"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "������ ����������"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, fuzzy, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, fuzzy, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "������ ������ �����"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "���� %08lX: %d ����� ���-������\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, fuzzy, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "���� %08lX.%lu: �������� � ���� ������ �������\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "���� %08lX.%lu: ������������ � ������� (����������� ����������� ����)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "���� %08lX.%lu: �������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3524,40 +3502,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, fuzzy, c-format
 msgid "skipped `%s': %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, fuzzy, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3565,51 +3543,51 @@ msgid ""
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "���� `%s' ����������. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "���������� (y/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 #, fuzzy
 msgid "Enter new filename"
 msgstr "--store [��� �����]"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
@@ -3642,25 +3620,25 @@ msgstr ""
 "�� ���������� �������� ������� ����� � ������������ ���������; ��������� %d "
 "���!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "Es gibt einen privaten ���� zu diesem �ffentlichen ����!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
 "entfernen.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Diesen ���� aus dem ����ring l�schen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater ����! - Wirklich l�schen? "
 
@@ -3863,6 +3841,38 @@ msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
 #, fuzzy
+#~ msgid "No key for user ID\n"
+#~ msgstr "���� %08lX: ��� �������������� ������������\n"
+
+#, fuzzy
+#~ msgid "No user ID for key\n"
+#~ msgstr "������ ��������� ����"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "��� ������ �������� ������ �� ���������\n"
+
+#, fuzzy
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "���������� ������������� ������ �������� ������: %s\n"
+
+#, fuzzy
+#~ msgid "error writing keyring `%s': %s\n"
+#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: ������������ �� ������\n"
+
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "����������� RSA ������� �� �������������, ����������, ��������� � ��������\n"
+#~ "������ ����� ��� ������������� � �������\n"
+
+#, fuzzy
 #~ msgid "not processed"
 #~ msgstr "�� ��������������"
 
@@ -3948,10 +3958,6 @@ msgstr "������ ��� `%s' �����������."
 #~ msgid "can't lock keyring `%': %s\n"
 #~ msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#, fuzzy
-#~ msgid "error writing keyring `%': %s\n"
-#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-
 #~ msgid "can't open file: %s\n"
 #~ msgstr "���������� ������� ����: %s\n"
 
@@ -3994,10 +4000,6 @@ msgstr "������ ��� `%s' �����������."
 #~ msgstr "�������������: gpgm [���������] "
 
 #, fuzzy
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
-
-#, fuzzy
 #~ msgid "lid %lu: read dir record failed: %s\n"
 #~ msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 01d970094..f78cb1498 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-08-21 16:04+0200\n"
+"POT-Creation-Date: 2000-10-10 12:43+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -37,7 +37,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:309
+#: g10/keyedit.c:575 util/miscutil.c:309
 msgid "quit"
 msgstr "avsluta"
 
@@ -252,7 +252,7 @@ msgstr "... detta �r en bugg (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
+#: cipher/random.c:321 g10/import.c:128 g10/keygen.c:1349
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
@@ -304,11 +304,11 @@ msgstr "kan inte st�nga \"%s\": %s\n"
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "f�r m�nga slumpm�ssiga bitar efterfr�gades; maximalt antal �r %d\n"
 
-#: cipher/random.c:657
+#: cipher/random.c:659
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:663
+#: cipher/random.c:665
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -323,7 +323,7 @@ msgstr ""
 "ANV�ND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:125
+#: cipher/rndlinux.c:126
 #, c-format
 msgid ""
 "\n"
@@ -347,7 +347,7 @@ msgstr "operationen �r ej m�jlig utan tillg�ng till s�kert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha anv�nt fel program f�r denna uppgift)\n"
 
-#: g10/gpg.c:198
+#: g10/gpg.c:201
 msgid ""
 "@Commands:\n"
 " "
@@ -355,139 +355,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:200
+#: g10/gpg.c:203
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:201
+#: g10/gpg.c:204
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:202
+#: g10/gpg.c:205
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/gpg.c:203
+#: g10/gpg.c:206
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:204
+#: g10/gpg.c:207
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/gpg.c:205
+#: g10/gpg.c:208
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/gpg.c:206
+#: g10/gpg.c:209
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/gpg.c:207
+#: g10/gpg.c:210
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:209
+#: g10/gpg.c:212
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/gpg.c:211
+#: g10/gpg.c:214
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/gpg.c:212
+#: g10/gpg.c:215
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:213
+#: g10/gpg.c:216
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/gpg.c:214
+#: g10/gpg.c:217
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/gpg.c:215
+#: g10/gpg.c:218
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:216
+#: g10/gpg.c:219
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/gpg.c:218
+#: g10/gpg.c:221
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/gpg.c:219
+#: g10/gpg.c:222
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:220
+#: g10/gpg.c:223
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:221
+#: g10/gpg.c:224
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:222
+#: g10/gpg.c:225
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/gpg.c:223
+#: g10/gpg.c:226
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:224
+#: g10/gpg.c:227
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:225
+#: g10/gpg.c:228
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/gpg.c:229
+#: g10/gpg.c:232
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/gpg.c:231
+#: g10/gpg.c:234
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/gpg.c:233
+#: g10/gpg.c:236
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/gpg.c:235
+#: g10/gpg.c:238
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/gpg.c:237
+#: g10/gpg.c:240
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:239
+#: g10/gpg.c:242
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/gpg.c:240
+#: g10/gpg.c:243
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/gpg.c:241
+#: g10/gpg.c:244
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/gpg.c:243
+#: g10/gpg.c:246
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/gpg.c:245
+#: g10/gpg.c:248
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:250
+#: g10/gpg.c:253
 msgid ""
 "@\n"
 "Options:\n"
@@ -497,152 +497,156 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:252
+#: g10/gpg.c:255
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:254
+#: g10/gpg.c:257
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/gpg.c:257
+#: g10/gpg.c:260
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/gpg.c:259
+#: g10/gpg.c:262
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/gpg.c:263
+#: g10/gpg.c:266
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/gpg.c:264
+#: g10/gpg.c:267
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
 
-#: g10/gpg.c:266
+#: g10/gpg.c:269
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/gpg.c:267
+#: g10/gpg.c:270
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/gpg.c:268
+#: g10/gpg.c:271
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/gpg.c:269
+#: g10/gpg.c:272
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/gpg.c:270
+#: g10/gpg.c:273
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/gpg.c:271
+#: g10/gpg.c:274
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/gpg.c:272
+#: g10/gpg.c:275
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/gpg.c:273
+#: g10/gpg.c:276
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/gpg.c:275
+#: g10/gpg.c:278
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/gpg.c:276
+#: g10/gpg.c:279
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/gpg.c:277
+#: g10/gpg.c:280
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/gpg.c:278
+#: g10/gpg.c:281
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/gpg.c:279
+#: g10/gpg.c:282
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/gpg.c:280
+#: g10/gpg.c:283
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/gpg.c:281
+#: g10/gpg.c:284
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/gpg.c:282
+#: g10/gpg.c:285
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/gpg.c:283
+#: g10/gpg.c:286
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/gpg.c:284
+#: g10/gpg.c:287
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/gpg.c:288
+#: g10/gpg.c:291
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/gpg.c:293
+#: g10/gpg.c:296
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/gpg.c:297
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/gpg.c:294
+#: g10/gpg.c:298
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/gpg.c:295
+#: g10/gpg.c:299
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/gpg.c:296
+#: g10/gpg.c:300
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/gpg.c:298
+#: g10/gpg.c:302
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/gpg.c:300
+#: g10/gpg.c:304
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/gpg.c:301
+#: g10/gpg.c:305
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/gpg.c:302
+#: g10/gpg.c:306
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/gpg.c:303
+#: g10/gpg.c:307
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/gpg.c:304
+#: g10/gpg.c:308
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/gpg.c:305
+#: g10/gpg.c:309
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/gpg.c:308
+#: g10/gpg.c:312
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -650,7 +654,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:311
+#: g10/gpg.c:315
 msgid ""
 "@\n"
 "Examples:\n"
@@ -670,17 +674,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:411
+#: g10/gpg.c:417
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera g�rna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <sv@li.org>.\n"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:421
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/gpg.c:418
+#: g10/gpg.c:424
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -690,7 +694,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/gpg.c:425
+#: g10/gpg.c:431
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -698,67 +702,71 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:537
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/gpg.c:585
+#: g10/gpg.c:595
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/gpg.c:640
+#: g10/gpg.c:651
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:736
+#: g10/gpg.c:743
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/gpg.c:740
+#: g10/gpg.c:747
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/gpg.c:747
+#: g10/gpg.c:754
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/gpg.c:940
+#: g10/gpg.c:946
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/gpg.c:1005 g10/gpg.c:1014
+#: g10/gpg.c:1016
+msgid "WARNING: program may create a core file!\n"
+msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
+
+#: g10/gpg.c:1019 g10/gpg.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/gpg.c:1007
+#: g10/gpg.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/gpg.c:1010
+#: g10/gpg.c:1024
 #, 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/gpg.c:1030 g10/gpg.c:1042
+#: g10/gpg.c:1044 g10/gpg.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/gpg.c:1036 g10/gpg.c:1048
+#: g10/gpg.c:1050 g10/gpg.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/gpg.c:1052
+#: g10/gpg.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/gpg.c:1055
+#: g10/gpg.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -769,127 +777,127 @@ 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/gpg.c:1057
+#: g10/gpg.c:1071
 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/gpg.c:1059
+#: g10/gpg.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/gpg.c:1061
+#: g10/gpg.c:1075
 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/gpg.c:1064
+#: g10/gpg.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1082
 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/gpg.c:1157
+#: g10/gpg.c:1171
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:1163
+#: g10/gpg.c:1177
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:1170
+#: g10/gpg.c:1184
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:1178
+#: g10/gpg.c:1192
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:1191
+#: g10/gpg.c:1205
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:1204
+#: g10/gpg.c:1218
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:1218
+#: g10/gpg.c:1232
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:1235
+#: g10/gpg.c:1249
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1257
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/gpg.c:1251
+#: g10/gpg.c:1265
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1273
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/gpg.c:1275
+#: g10/gpg.c:1289
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/gpg.c:1278
+#: g10/gpg.c:1292
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:311 g10/gpg.c:1315 g10/sign.c:449
+#: g10/encode.c:314 g10/gpg.c:1329 g10/sign.c:543
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1344
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/gpg.c:1396
+#: g10/gpg.c:1410
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/gpg.c:1404
+#: g10/gpg.c:1418
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/gpg.c:1477 g10/gpg.c:1498
+#: g10/gpg.c:1495 g10/gpg.c:1516
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1601
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:1587
+#: g10/gpg.c:1605
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:59 g10/gpg.c:1590 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1608 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/gpg.c:1768
+#: g10/gpg.c:1786
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
 "ett understrykningstecken (_)\n"
 
-#: g10/gpg.c:1774
+#: g10/gpg.c:1792
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -897,11 +905,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/gpg.c:1780
+#: g10/gpg.c:1798
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
 
-#: g10/gpg.c:1788
+#: g10/gpg.c:1806
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -987,7 +995,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1191 g10/pkclist.c:54
+#: g10/keyedit.c:1182 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
@@ -1223,12 +1231,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det �r inte s�kert att signaturen tillh�r �garen.\n"
 
-#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:970 g10/pkclist.c:1016
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s �verhoppad\n"
 
-#: g10/pkclist.c:828 g10/pkclist.c:995
+#: g10/pkclist.c:828 g10/pkclist.c:998
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
@@ -1247,35 +1255,35 @@ msgstr "Ange anv�ndaridentiteten: "
 msgid "No such user ID.\n"
 msgstr "Hittade inte anv�ndaridentiteten.\n"
 
-#: g10/pkclist.c:882
+#: g10/pkclist.c:883
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade �ver: den publika nyckeln �r redan satt som f�rvald mottagare\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:906
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:912
+#: g10/pkclist.c:913
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "hoppade �ver: publik nyckel �r redan angiven med --encrypt-to\n"
 
-#: g10/pkclist.c:943
+#: g10/pkclist.c:944
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
-#: g10/pkclist.c:976
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#: g10/pkclist.c:981
+#: g10/pkclist.c:984
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade �ver: den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:1019
+#: g10/pkclist.c:1022
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
@@ -1287,58 +1295,58 @@ msgstr "skriver sj�lvsignatur\n"
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
+#: g10/keygen.c:307 g10/keygen.c:417 g10/keygen.c:527
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; anv�nder %u bitar\n"
 
-#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
+#: g10/keygen.c:312 g10/keygen.c:422 g10/keygen.c:532
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad upp�t till %u bitar\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:631
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:635
+#: g10/keygen.c:633
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:634
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:639
+#: g10/keygen.c:637
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:639
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:645
+#: g10/keygen.c:643
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
-#: g10/keygen.c:656 g10/keygen.c:664
+#: g10/keygen.c:654 g10/keygen.c:662
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vill du verkligen skapa en nyckel f�r signering och kryptering? "
 
-#: g10/keygen.c:678
+#: g10/keygen.c:676
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:688
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1351,19 +1359,19 @@ msgstr ""
 "              den f�rvalda nyckelstorleken �r 1024 bitar\n"
 "    den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
 
-#: g10/keygen.c:697
+#: g10/keygen.c:695
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:702
+#: g10/keygen.c:700
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA till�ter bara nyckelstorlekar fr�n 512 till 1024\n"
 
-#: g10/keygen.c:704
+#: g10/keygen.c:702
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
 
-#: g10/keygen.c:706
+#: g10/keygen.c:704
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
@@ -1376,12 +1384,12 @@ msgstr "nyckelstorleken �r f�r liten; 768 �r det minst till�tna v�rdet.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:717
+#: g10/keygen.c:715
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "nyckelstorleken �r f�r stor; %d �r det st�rsta till�tna v�rdet\n"
 
-#: g10/keygen.c:722
+#: g10/keygen.c:720
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1389,11 +1397,11 @@ msgstr ""
 "Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
 "eftersom ber�kningar tar MYCKET l�ng tid!\n"
 
-#: g10/keygen.c:725
+#: g10/keygen.c:723
 msgid "Are you sure that you want this keysize? "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:726
+#: g10/keygen.c:724
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1401,22 +1409,22 @@ msgstr ""
 "Ok, men kom ih�g att din bildsk�rm och ditt tangentbord ocks� s�nder\n"
 "avsl�jande str�lning som kan avlyssnas!\n"
 
-#: g10/keygen.c:734
+#: g10/keygen.c:732
 msgid "Do you really need such a large keysize? "
 msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
 
-#: g10/keygen.c:740
+#: g10/keygen.c:738
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
 
-#: g10/keygen.c:743 g10/keygen.c:747
+#: g10/keygen.c:741 g10/keygen.c:745
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade upp�t till %u bitar\n"
 
 # borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:795
+#: g10/keygen.c:793
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1432,25 +1440,25 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n m�nader\n"
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
-#: g10/keygen.c:810
+#: g10/keygen.c:808
 msgid "Key is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:815
+#: g10/keygen.c:813
 msgid "invalid value\n"
 msgstr "ogiltigt v�rde\n"
 
-#: g10/keygen.c:820
+#: g10/keygen.c:818
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln g�r aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:826
+#: g10/keygen.c:824
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
 
-#: g10/keygen.c:829
+#: g10/keygen.c:827
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1458,11 +1466,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare �n �r 2038.\n"
 "Datum fram till �r 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:834
+#: g10/keygen.c:832
 msgid "Is this correct (y/n)? "
 msgstr "St�mmer detta (j/n)? "
 
-#: g10/keygen.c:877
+#: g10/keygen.c:875
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1478,44 +1486,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:889
+#: g10/keygen.c:887
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:893
+#: g10/keygen.c:895
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:895
+#: g10/keygen.c:897
 msgid "Name may not start with a digit\n"
 msgstr "Namnet f�r inte b�rja med en siffra\n"
 
-#: g10/keygen.c:897
+#: g10/keygen.c:899
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
 
-#: g10/keygen.c:905
+#: g10/keygen.c:907
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:916
+#: g10/keygen.c:918
 msgid "Not a valid email address\n"
 msgstr "Epostadressen �r ogiltig\n"
 
-#: g10/keygen.c:924
+#: g10/keygen.c:926
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:930
+#: g10/keygen.c:932
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:957
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:963
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1526,28 +1534,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:966
+#: g10/keygen.c:967
 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:971
+#: g10/keygen.c:972
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:981
+#: g10/keygen.c:982
 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:982
+#: g10/keygen.c:983
 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:1001
+#: g10/keygen.c:1002
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1039
+#: g10/keygen.c:1040
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1555,11 +1563,11 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:1047
+#: g10/keyedit.c:463 g10/keygen.c:1048
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
 
-#: g10/keygen.c:1053
+#: g10/keygen.c:1054
 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"
@@ -1570,7 +1578,7 @@ msgstr ""
 "Jag kommer att g�ra det �nd�. Du kan �ndra din l�senordsfras n�rsomhelst\n"
 "om du anv�nder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:1074
+#: g10/keygen.c:1075
 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"
@@ -1582,29 +1590,29 @@ 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:1523
+#: g10/keygen.c:1524
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1567
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1664
+#: g10/keygen.c:1665
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1760
+#: g10/keygen.c:1757
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1765
+#: g10/keygen.c:1762
 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"
@@ -1613,13 +1621,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:1782 g10/keygen.c:1883
+#: g10/keygen.c:1775 g10/keygen.c:1876
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
+#: g10/keygen.c:1819 g10/sig-check.c:297 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1627,7 +1635,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:1828 g10/sig-check.c:302 g10/sign.c:169
+#: g10/keygen.c:1821 g10/sig-check.c:299 g10/sign.c:171
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1635,11 +1643,11 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:1861
+#: g10/keygen.c:1854
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:179 g10/openfile.c:289 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1650,42 +1658,37 @@ msgstr "%s: kan inte �ppna: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av l�senordsfras: %s\n"
 
-#: g10/encode.c:222 g10/encode.c:370
+#: g10/encode.c:222 g10/encode.c:354
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:317
+#: g10/encode.c:320
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fr�n \"%s\"\n"
 
-#: g10/encode.c:534
+#: g10/encode.c:527
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad f�r: %s\n"
 
-#: g10/export.c:153
+#: g10/delkey.c:64 g10/export.c:153 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: hittade inte anv�ndaren: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "fel vid l�sning av certifikat: %s\n"
-
-#: g10/export.c:171
+#: g10/export.c:164
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/export.c:182
+#: g10/export.c:175
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:232
+#: g10/export.c:225
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -1693,265 +1696,254 @@ msgstr "VARNING: exporterade ingenting\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:351
+#: g10/getkey.c:445
 msgid "too many entries in unk cache - disabled\n"
 msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:1311 g10/getkey.c:1350
-msgid "RSA key cannot be used in this version\n"
-msgstr "det g�r inte att anv�nda RSA-nycklar i denna version\n"
-
-#: g10/getkey.c:1313 g10/getkey.c:1352
-msgid "No key for user ID\n"
-msgstr "Ingen nyckel f�r anv�ndaridentiteten\n"
-
-#: g10/getkey.c:1391 g10/getkey.c:1431
-msgid "No user ID for key\n"
-msgstr "Inget anv�ndarid f�r nyckel\n"
-
-#: g10/getkey.c:1645 g10/getkey.c:1701
+#: g10/getkey.c:2189
 #, 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:2020
+#: g10/getkey.c:2230 g10/trustdb.c:578
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
+
+#: g10/getkey.c:2513
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: hittade inte anv�ndaren\n"
 
-#: g10/import.c:181
+#: g10/import.c:182
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar �ver block av typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
+#: g10/import.c:189 g10/trustdb.c:1817 g10/trustdb.c:1858
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:193
+#: g10/import.c:194
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/import.c:203
+#: g10/import.c:204
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:205
+#: g10/import.c:206
+#, fuzzy, c-format
+msgid "      skipped new keys: %lu\n"
+msgstr "                 nya undernycklar: %lu\n"
+
+#: g10/import.c:209
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:207
+#: g10/import.c:211
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:213
+#: g10/import.c:217
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      of�r�ndrade: %lu\n"
 
-#: g10/import.c:215
+#: g10/import.c:219
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:217
+#: g10/import.c:221
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:223
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:225
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nya �terkallelser av nycklar: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:227
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal l�sta hemliga nycklar: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:229
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:231
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:386 g10/import.c:578
+#: g10/import.c:389 g10/import.c:568
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
 
-#: g10/import.c:400
+#: g10/import.c:403
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 
-#: g10/import.c:402
+#: g10/import.c:405
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero p� att det saknas en sj�lvsignatur\n"
 
-#: g10/import.c:413 g10/import.c:645
+#: g10/import.c:416 g10/import.c:624
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:419
-msgid "no default public keyring\n"
-msgstr "ingen f�rvald publik nyckel\n"
+#: g10/import.c:421
+#, fuzzy, c-format
+msgid "key %08lX: new key - skipped\n"
+msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
+#: g10/import.c:429 g10/openfile.c:231 g10/sign.c:440 g10/sign.c:695
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:426 g10/import.c:484 g10/import.c:593 g10/import.c:694
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
-
-#: g10/import.c:429 g10/import.c:487 g10/import.c:596 g10/import.c:697
-#, c-format
-msgid "error writing keyring `%s': %s\n"
+#: g10/import.c:433 g10/import.c:480 g10/import.c:578 g10/import.c:667
+#, fuzzy, c-format
+msgid "error writing key: %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:434
+#: g10/import.c:436
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:451
+#: g10/import.c:453
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:460 g10/import.c:653
+#: g10/import.c:462 g10/import.c:632
 #, 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:466 g10/import.c:659
-#, 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:493
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny anv�ndaridentitet\n"
 
-#: g10/import.c:496
+#: g10/import.c:487
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
 
-#: g10/import.c:499
+#: g10/import.c:490
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:502
+#: g10/import.c:493
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:505
+#: g10/import.c:496
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:508
+#: g10/import.c:499
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:518
+#: g10/import.c:509
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:601
+#: g10/import.c:581
 #, 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:605
+#: g10/import.c:585
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:610
+#: g10/import.c:590
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:639
+#: g10/import.c:618
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: ingen publik nyckel - kan inte till�mpa "
 "�terkallelsecertifikatet\n"
 
-#: g10/import.c:670
+#: g10/import.c:643
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:702
+#: g10/import.c:670
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
 
-#: g10/import.c:744
+#: g10/import.c:712
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
-#: g10/import.c:751 g10/import.c:775
+#: g10/import.c:719 g10/import.c:743
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen f�r publik nyckel ej st�dd\n"
 
-#: g10/import.c:752
+#: g10/import.c:720
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/import.c:767
+#: g10/import.c:735
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:776
+#: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:803
+#: g10/import.c:771
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
 
-#: g10/import.c:832
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:855
+#: g10/import.c:823
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -1960,98 +1952,93 @@ 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:880
+#: g10/import.c:848
 #, 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:889
+#: g10/import.c:857
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat p� fel plats - hoppade �ver\n"
 
-#: g10/import.c:897
+#: g10/import.c:865
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
 
-#: g10/import.c:997
+#: g10/import.c:965
 #, 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:1048
+#: g10/import.c:1016
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 
-#: g10/import.c:1162 g10/import.c:1215
+#: g10/import.c:1130 g10/import.c:1183
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: hittade inte anv�ndaren\n"
-
-#: g10/keyedit.c:155
+#: g10/keyedit.c:150
 msgid "[revocation]"
 msgstr "[�terkallelse]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:151
 msgid "[self-signature]"
 msgstr "[sj�lvsignatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:215
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:217
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:219
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:221
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:223
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:225
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:227
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 anv�ndaridentitet utan giltig sj�lvsignatur hittades\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:229
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:311
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:319
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:328
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2059,7 +2046,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:337
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2067,33 +2054,33 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:342
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
+#: g10/keyedit.c:368 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:193
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:426
 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:435
+#: g10/keyedit.c:430
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:450
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:455
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2101,7 +2088,7 @@ msgstr ""
 "Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:467
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2109,424 +2096,424 @@ msgstr ""
 "Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:470
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:534
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:575
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:576
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:577
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:578
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:580
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:581
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:582
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:583
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:584
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:585
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:586
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:587
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:588
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:589
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:590
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:591
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:592
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:593
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:594
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:595
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:596
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:597
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:599
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:600
 msgid "list preferences"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:601
 msgid "change the passphrase"
 msgstr "�ndra l�senordsfrasen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:607
+#: g10/keyedit.c:602
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:603
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:604
 msgid "revoke a secondary key"
 msgstr "�terkalla en sekund�r nyckel"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:605
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:606
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/delkey.c:110 g10/keyedit.c:630
+#: g10/delkey.c:103 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "kan ej g�ra detta i batch-l�ge\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:668
+#: g10/keyedit.c:659
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:697
+#: g10/keyedit.c:688
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:718
 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:731
+#: g10/keyedit.c:722
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:769
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:770
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:811 g10/keyedit.c:993
+#: g10/keyedit.c:802 g10/keyedit.c:984
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
 
-#: g10/keyedit.c:822 g10/keyedit.c:843
+#: g10/keyedit.c:813 g10/keyedit.c:834
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:815
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:818
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:819
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:864 g10/keyedit.c:886
+#: g10/keyedit.c:855 g10/keyedit.c:877
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:859
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:860
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:881
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen �terkalla de valda nycklarna? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
-#: g10/keyedit.c:957
+#: g10/keyedit.c:948
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:960
+#: g10/keyedit.c:951
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:971
+#: g10/keyedit.c:962
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:969
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:976
 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:1000
+#: g10/keyedit.c:991
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1083 g10/keyedit.c:1109
+#: g10/keyedit.c:1074 g10/keyedit.c:1100
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1083
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1096
+#: g10/keyedit.c:1087
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1116
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nyckeln %08lX: en undernyckel har �terkallats!\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1119
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "     nya �terkallelser av nycklar: %lu\n"
 
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1121
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna sj�lvsignatur? (j/N)"
 
 # skulle lika g�rna kunna heta 1 signatur va?
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1514
 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:1539
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:1646
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:1747
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2535,34 +2522,34 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1742
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Vill du skapa ett �terkallelsecertifikat f�r denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1775
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:1789 g10/keyedit.c:1824
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1794
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �terkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
@@ -2698,30 +2685,17 @@ msgstr "signatur av den gamla (PGP 2.x) typen\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:83
+#: g10/misc.c:86
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:86
-msgid "WARNING: program may create a core file!\n"
-msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
-
-#: g10/misc.c:312
+#: g10/misc.c:314
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer b�r inte anv�ndas!\n"
 
-# maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
-#: g10/misc.c:326
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
-msgstr ""
-"RSA-nycklar �r f�rlegade; �verv�g att skapa nya nycklar och anv�nd dessa i "
-"framtiden\n"
-
 # XXX
-#: g10/misc.c:348
+#: g10/misc.c:342
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "avr�der fr�n denna chifferalgoritm, anv�nd ist�llet en mer normal algoritm!\n"
@@ -2731,7 +2705,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d f�r publik nyckelhantering\n"
 
-#: g10/parse-packet.c:963
+#: g10/parse-packet.c:992
 #, 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"
@@ -2844,30 +2818,30 @@ msgstr "l�ser fr�n standard in ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte �ppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:135
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonym mottagare, f�rs�ker anv�nda den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:144
+#: g10/pubkey-enc.c:141
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi �r den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:200
+#: g10/pubkey-enc.c:197
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln st�ds inte\n"
 
-#: g10/pubkey-enc.c:219
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "chifferalgoritmen %d �r ok�nd eller avslagen\n"
 
-#: g10/pubkey-enc.c:258
+#: g10/pubkey-enc.c:255
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTERA: chifferalgoritmen %d finns inte i inst�llningarna\n"
 
-#: g10/pubkey-enc.c:264
+#: g10/pubkey-enc.c:261
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
@@ -2906,66 +2880,66 @@ msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades s�nda till \"%s\": status=%u\n"
 
-#: g10/seckey-cert.c:90
+#: g10/seckey-cert.c:89
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna �r inte tillg�nliga\n"
 
-#: g10/seckey-cert.c:96
+#: g10/seckey-cert.c:95
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "skyddsalgoritmen %d st�ds inte\n"
 
-#: g10/seckey-cert.c:241
+#: g10/seckey-cert.c:245
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ogiltig l�senordsfras, f�rs�k igen ...\n"
 
 # �r det nyckeln som �r svag, konstigt
-#: g10/seckey-cert.c:304
+#: g10/seckey-cert.c:308
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Uppt�ckte en svag nyckel - byt l�senordsfras igen.\n"
 
-#: g10/sig-check.c:282
+#: g10/sig-check.c:279
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "detta �r en PGP-genererad ElGamal-nyckel som INTE �r s�ker f�r signaturer!\n"
 
 # beh�vs verkligen c-format h�r?
-#: g10/sig-check.c:290
+#: g10/sig-check.c:287
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "den publika nyckeln �r %lu sekund nyare �n signaturen\n"
 
-#: g10/sig-check.c:291
+#: g10/sig-check.c:288
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln �r %lu sekunder nyare �n signaturen\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:306
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTERA: signaturnyckeln �r f�r gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:378
+#: g10/sig-check.c:375
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen �r felaktig eftersom en ok�nd kritisk bit �r satt\n"
 
-#: g10/sign.c:195
+#: g10/sign.c:197
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:345 g10/sign.c:664
+#: g10/sign.c:435 g10/sign.c:690
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:444
+#: g10/sign.c:538
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:487
+#: g10/sign.c:583
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" �r en tom fil\n"
@@ -3004,8 +2978,8 @@ msgstr "%s: ingen �tkomst: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
-#: g10/ringedit.c:1878 g10/tdbio.c:444
+#: g10/openfile.c:227 g10/openfile.c:296 g10/ringedit.c:843
+#: g10/ringedit.c:1161 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
@@ -3107,293 +3081,298 @@ msgstr "tillitsdatabasen �r trasig, k�r \"gpg --fix-trustdb\".\n"
 
 # req �r nog felstavat i originalet d� det syftar p� record och inte
 # request
-#: g10/trustdb.c:168
+#: g10/trustdb.c:169
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "tillitspost %lu, posttyp %d: kunde inte l�sa: %s\n"
 
-#: g10/trustdb.c:183
+#: g10/trustdb.c:184
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
 
-#: g10/trustdb.c:197
+#: g10/trustdb.c:198
 #, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "tillitspost %lu: kunde inte radera: %s\n"
 
-#: g10/trustdb.c:211
+#: g10/trustdb.c:212
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
 # LID betyder local id och �r serienumret i den lokala databasen
 # f�r en given nyckel
-#: g10/trustdb.c:376
+#: g10/trustdb.c:377
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
 msgstr "fel vid l�sning av katalogpost f�r lokalt id %lu: %s\n"
 
-#: g10/trustdb.c:383
+#: g10/trustdb.c:384
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lokalt id %lu: v�ntade en katalogpost, fick en post av typen %d\n"
 
-#: g10/trustdb.c:388
+#: g10/trustdb.c:389
 #, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "ingen prim�r nyckel f�r lokalt id %lu\n"
 
-#: g10/trustdb.c:393
+#: g10/trustdb.c:394
 #, c-format
 msgid "error reading primary key for LID %lu: %s\n"
 msgstr "fel vid l�sning av prim�r nyckel f�r lokalt id %lu: %s\n"
 
-#: g10/trustdb.c:432
+#: g10/trustdb.c:433
 #, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record misslyckades: %s\n"
 
-#: g10/trustdb.c:487
-#, c-format
-msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "NOTERA: den hemliga nyckeln %08lX �r INTE skyddad.\n"
-
-#: g10/trustdb.c:495
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
+#: g10/trustdb.c:474
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "%s: ogiltig nyckelidentitet\n"
 
 #: g10/trustdb.c:502
 #, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "nyckel %08lX: hemlig och publik nyckel st�mmer inte �verens\n"
-
-#: g10/trustdb.c:514
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "nyckel %08lX: kan inte l�gga till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:520
+#: g10/trustdb.c:508
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "nyckel %08lX: uppslagning av post misslyckades\n"
 
-#: g10/trustdb.c:529
+#: g10/trustdb.c:517
 #, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "nyckel %08lX: finns redan i tabellen �ver p�litliga nycklar\n"
 
-#: g10/trustdb.c:532
+#: g10/trustdb.c:520
 #, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "nyckel %08lX: accepterad som en p�litlig nyckel\n"
 
-#: g10/trustdb.c:540
+#: g10/trustdb.c:547
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
+
+#: g10/trustdb.c:566
+#, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "NOTERA: den hemliga nyckeln %08lX �r INTE skyddad.\n"
+
+#: g10/trustdb.c:585
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "nyckel %08lX: hemlig och publik nyckel st�mmer inte �verens\n"
+
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "numrering av hemliga nycklar misslyckades: %s\n"
 
-#: g10/trustdb.c:925
+#: g10/trustdb.c:994
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "nyckel: %08lX.%lu: Korrekt bindning till undernyckel\n"
 
-#: g10/trustdb.c:931 g10/trustdb.c:966
+#: g10/trustdb.c:1000 g10/trustdb.c:1035
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig bindning till undernyckel: %s\n"
 
-#: g10/trustdb.c:943
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig �terkallelse av nyckel\n"
 
-#: g10/trustdb.c:949
+#: g10/trustdb.c:1018
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig �terkallelse av nyckel: %s\n"
 
-#: g10/trustdb.c:960
+#: g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig �terkallelse av undernyckel\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1140
 msgid "Good self-signature"
 msgstr "Korrekt sj�lvsignatur"
 
-#: g10/trustdb.c:1081
+#: g10/trustdb.c:1150
 msgid "Invalid self-signature"
 msgstr "Felaktig sj�lvsignatur"
 
 # detta verkar mycket m�rkligt. N�gon borde kanske f� en f�rklaring fr�n
 # gnupg-utvecklarna?
-#: g10/trustdb.c:1108
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Hoppade �ver en giltig �terkallelse av anv�ndaridentiteten p�\n"
 "grund av en nyare sj�lvsignatur"
 
-#: g10/trustdb.c:1114
+#: g10/trustdb.c:1183
 msgid "Valid user ID revocation"
 msgstr "Giltig �terkallelse av anv�ndaridentitet"
 
-#: g10/trustdb.c:1119
+#: g10/trustdb.c:1188
 msgid "Invalid user ID revocation"
 msgstr "Ogiltig �terkallelse av anv�ndaridentitet"
 
-#: g10/trustdb.c:1161
+#: g10/trustdb.c:1230
 msgid "Valid certificate revocation"
 msgstr "Giltig �terkallelse av certifikat"
 
-#: g10/trustdb.c:1162
+#: g10/trustdb.c:1231
 msgid "Good certificate"
 msgstr "Korrekt certifikat"
 
-#: g10/trustdb.c:1190
+#: g10/trustdb.c:1259
 msgid "Invalid certificate revocation"
 msgstr "Ogiltig �terkallelse av certifikat "
 
-#: g10/trustdb.c:1191
+#: g10/trustdb.c:1260
 msgid "Invalid certificate"
 msgstr "Ogiltigt certifikat"
 
-#: g10/trustdb.c:1208 g10/trustdb.c:1212
+#: g10/trustdb.c:1277 g10/trustdb.c:1281
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "signaturpost %lu[%d] pekar mot fel post.\n"
 
-#: g10/trustdb.c:1271
+#: g10/trustdb.c:1340
 msgid "duplicated certificate - deleted"
 msgstr "dubblett av certifikat - borttaget"
 
-#: g10/trustdb.c:1592
+#: g10/trustdb.c:1661
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir misslyckades: %s\n"
 
-#: g10/trustdb.c:1726
+#: g10/trustdb.c:1795
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lokalt id ?: till�gg misslyckades: %s\n"
 
-#: g10/trustdb.c:1731
+#: g10/trustdb.c:1800
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lokalt id %lu: till�gg misslyckades: %s\n"
 
-#: g10/trustdb.c:1737
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lokalt id %lu: lades till\n"
 
-#: g10/trustdb.c:1742
+#: g10/trustdb.c:1811
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fel vid l�sning av katalogpost: %s\n"
 
-#: g10/trustdb.c:1750 g10/trustdb.c:1813
+#: g10/trustdb.c:1819 g10/trustdb.c:1882
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu nycklar behandlade\n"
 
-#: g10/trustdb.c:1752 g10/trustdb.c:1819
+#: g10/trustdb.c:1821 g10/trustdb.c:1888
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu nycklar med fel\n"
 
-#: g10/trustdb.c:1754
+#: g10/trustdb.c:1823
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu nycklar tillagda\n"
 
-#: g10/trustdb.c:1757
+#: g10/trustdb.c:1826
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/trustdb.c:1805
+#: g10/trustdb.c:1874
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lokalt id %lu: katalogpost utan nyckel - hoppade �ver\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1884
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu p� grund av nya publika nycklar\n"
 
-#: g10/trustdb.c:1817
+#: g10/trustdb.c:1886
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu nycklar hoppades �ver\n"
 
-#: g10/trustdb.c:1821
+#: g10/trustdb.c:1890
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu nycklar uppdaterades\n"
 
-#: g10/trustdb.c:2166
+#: g10/trustdb.c:2235
 msgid "Ooops, no keys\n"
 msgstr "Ooops, inga nycklar\n"
 
-#: g10/trustdb.c:2170
+#: g10/trustdb.c:2239
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, inga anv�ndaridentiteter\n"
 
-#: g10/trustdb.c:2328
+#: g10/trustdb.c:2397
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: s�kning av katalogpost misslyckades: %s\n"
 
-#: g10/trustdb.c:2337
+#: g10/trustdb.c:2406
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "nyckel %08lX: till�gg av tillitspost misslyckades: %s\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2410
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "nyckel %08lX.%lu: lades till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:2349
+#: g10/trustdb.c:2418
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "nyckel %08lX.%lu: skapad i framtiden (problemet �r relaterat till\n"
 "tidsresande eller en felst�lld klocka)\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2433
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "nyckel %08lX.%lu: gick ut %s\n"
 
-#: g10/trustdb.c:2372
+#: g10/trustdb.c:2441
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "nyckel %08lX.%lu: tillitskontroll misslyckades: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2592
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/trustdb.c:2525
+#: g10/trustdb.c:2594
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem att hitta \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2528
+#: g10/trustdb.c:2597
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "anv�ndaren \"%s\" finns inte tillitsdatabasen - l�gger till\n"
 
-#: g10/trustdb.c:2531
+#: g10/trustdb.c:2600
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2717 g10/trustdb.c:2747
+#: g10/trustdb.c:2786 g10/trustdb.c:2816
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "VARNING: kan �nnu inte hantera l�nga inst�llningsposter\n"
 
@@ -3412,41 +3391,41 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u �r f�r l�ng, eller saknar nyradstecken\n"
 
-#: g10/ringedit.c:324
+#: g10/ringedit.c:296
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan inte skapa nyckelring: %s\n"
 
-#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
+#: g10/ringedit.c:313 g10/ringedit.c:848 g10/ringedit.c:1166
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
 # m�rkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1589 g10/ringedit.c:2060
+#: g10/ringedit.c:1025 g10/ringedit.c:1343
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/ringedit.c:1590 g10/ringedit.c:2061
+#: g10/ringedit.c:1026 g10/ringedit.c:1344
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s �r den of�r�ndrade\n"
 
-#: g10/ringedit.c:1591 g10/ringedit.c:2062
+#: g10/ringedit.c:1027 g10/ringedit.c:1345
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �r den nya\n"
 
-#: g10/ringedit.c:1592 g10/ringedit.c:2063
+#: g10/ringedit.c:1028 g10/ringedit.c:1346
 msgid "Please fix this possible security flaw\n"
 msgstr "L�s detta potentiella s�kerhetsproblem\n"
 
-#: g10/skclist.c:96
+#: g10/skclist.c:98
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade �ver \"%s\": %s\n"
 
-#: g10/skclist.c:102
+#: g10/skclist.c:105
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3456,50 +3435,50 @@ msgstr ""
 "som inte �r s�ker f�r signaturer!\n"
 
 #. do not overwrite
-#: g10/openfile.c:79
+#: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Filen \"%s\" finns. "
 
-#: g10/openfile.c:81
+#: g10/openfile.c:86
 msgid "Overwrite (y/N)? "
 msgstr "Skriv �ver (j/N)? "
 
-#: g10/openfile.c:109
+#: g10/openfile.c:120
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: ok�nt suffix\n"
 
-#: g10/openfile.c:131
+#: g10/openfile.c:142
 msgid "Enter new filename"
 msgstr "Ange nytt filnamn"
 
-#: g10/openfile.c:172
+#: g10/openfile.c:183
 msgid "writing to stdout\n"
 msgstr "skriver till standard ut\n"
 
-#: g10/openfile.c:250
+#: g10/openfile.c:262
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "antar att signera data finns i filen \"%s\"\n"
 
-#: g10/openfile.c:300
+#: g10/openfile.c:312
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: ny inst�llningsfil skapad\n"
 
-#: g10/openfile.c:313
+#: g10/openfile.c:339
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: g10/openfile.c:316
+#: g10/openfile.c:342
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog skapad\n"
 
 # GnuPG borde v�l ers�ttas med %s?
-#: g10/openfile.c:318
+#: g10/openfile.c:344
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "du m�ste starta om GnuPG, s� att den nya inst�llningsfilen kan l�sas\n"
 
@@ -3531,23 +3510,23 @@ msgstr ""
 "kan inte undvika en svag nyckel f�r symmetriskt chiffer; f�rs�kte\n"
 "%d g�nger!\n"
 
-#: g10/delkey.c:94
+#: g10/delkey.c:87
 msgid "there is a secret key for this public key!\n"
 msgstr "det finns en hemlig nyckel tillh�rande denna publika nyckel!\n"
 
-#: g10/delkey.c:96
+#: g10/delkey.c:89
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "anv�nd flaggan \"--delete-secret-key\" f�r att ta bort den f�rst.\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:107
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte g�ra s� i batch-l�ge utan flaggan \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:129
 msgid "Delete this key from the keyring? "
 msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:137
 msgid "This is a secret key! - really delete? "
 msgstr "Detta �r en hemlig nyckel! - vill du verkligen ta bort den? "
 
@@ -3819,6 +3798,38 @@ msgstr "Det finns ingen hj�lp tillg�nglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
 
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "fel vid l�sning av certifikat: %s\n"
+
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "det g�r inte att anv�nda RSA-nycklar i denna version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen nyckel f�r anv�ndaridentiteten\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Inget anv�ndarid f�r nyckel\n"
+
+#~ msgid "no default public keyring\n"
+#~ msgstr "ingen f�rvald publik nyckel\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
+
+#~ msgid "key %08lX: can't read original keyblock: %s\n"
+#~ msgstr "nyckel %08lX: kan inte l�sa det ursprungliga nyckelblocket %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: hittade inte anv�ndaren\n"
+
+# maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "RSA-nycklar �r f�rlegade; �verv�g att skapa nya nycklar och anv�nd dessa i "
+#~ "framtiden\n"
+
 #~ msgid "not processed"
 #~ msgstr "inte behandlade"