Last changes before 1.0.6a snapshot releaseSNAP-1-0-6a

26 files changed, 12197 insertions, 9792 deletions

diff --git a/Makefile.am b/Makefile.am
index f2a2666e5..ba47bded2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ checks = checks
 endif
 
 SUBDIRS = intl zlib util mpi cipher tools g10 po doc ${checks}
-EXTRA_DIST = VERSION  PROJECTS BUGS
+EXTRA_DIST = VERSION  PROJECTS BUGS config.h.in
 DISTCLEANFILES = g10defs.h 
 
 # Add all the files listed in "distfiles" files to the distribution,
diff --git a/TODO b/TODO
index ed9f2fe2f..078262c63 100644
--- a/TODO
+++ b/TODO
@@ -76,7 +76,8 @@
   * Add option to put the list of recipients (from the encryption
     layer) into the signatures notation data.
 
-  * Allow to update key signatyres, add status that a key is already signed.
+  * Allow to update key signatures.
+
 
 Scheduled for 1.1
 -----------------
diff --git a/doc/DETAILS b/doc/DETAILS
index 807f374d7..8d2217844 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -287,6 +287,12 @@ more arguments in future versions.
         Issued for each unusable recipient. The only reason code 
         currently defined is 0 for "No specific reason given".
 
+    INV_RECP <reserved>
+        Issued when no recipients are usable.
+
+    ALREADY_SIGNED <long-keyid>
+        Warning: This is eperimental and might be removed at any time.
+
 
 Key generation
 ==============
diff --git a/g10/ChangeLog b/g10/ChangeLog
index bbd0e8656..0345c7f00 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,9 @@
 2001-09-07  Werner Koch  <[email protected]>
 
+	* status.c, status.h: Added NO_RECP and ALREADY_SIGNED.
+	* pkclist.c (build_pk_list): Issue NO_RECP.
+	* keyedit.c (sign_uids): Added experimental ALREADY_SIGNED
+
 	* hkp.c (hkp_import): Use log_error. Bug reported by Neal H
 	Walfield. 
 
diff --git a/g10/getkey.c b/g10/getkey.c
index 65796239f..31ace1703 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -2067,7 +2067,7 @@ lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode )
 
   found:
     if( rc && rc != -1 )
-	log_error("enum_keyblocks_read failed: %s\n", g10_errstr(rc));
+	log_error("keydb_search failed: %s\n", g10_errstr(rc));
 
     if( !rc ) {
         *ret_keyblock = ctx->keyblock; /* return the keyblock */
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 033220de1..d1cc9da38 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -290,10 +290,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified, int local )
 		&& (node->pkt->pkt.signature->sig_class&~3) == 0x10 ) {
 		if( sk_keyid[0] == node->pkt->pkt.signature->keyid[0]
 		    && sk_keyid[1] == node->pkt->pkt.signature->keyid[1] ) {
+                    char buf[50];
+
 		    /* Fixme: see whether there is a revocation in which
 		     * case we should allow to sign it again. */
 		    tty_printf(_("Already signed by key %08lX\n"),
 							(ulong)sk_keyid[1] );
+                    sprintf (buf, "%08lX%08lX",
+                             (ulong)sk->keyid[0], (ulong)sk->keyid[1] );
+                    write_status_text (STATUS_ALREADY_SIGNED, buf);
 		    uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */
 		}
 	    }
diff --git a/g10/pkclist.c b/g10/pkclist.c
index e09d55418..cad60c059 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -1047,6 +1047,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 
     if( !rc && !any_recipients ) {
 	log_error(_("no valid addressees\n"));
+        write_status_text (STATUS_NO_RECP, "0");
 	rc = G10ERR_NO_USER_ID;
     }
 
diff --git a/g10/status.c b/g10/status.c
index 7a7ddf850..415484743 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -141,6 +141,8 @@ get_status_string ( int no )
       case STATUS_USERID_HINT    : s = "USERID_HINT"; break;
       case STATUS_UNEXPECTED     : s = "UNEXPECTED"; break;
       case STATUS_INV_RECP       : s = "INV_RECP"; break;
+      case STATUS_NO_RECP        : s = "NO_RECP"; break;
+      case STATUS_ALREADY_SIGNED : s = "ALREADY_SIGNED"; break;
       default: s = "?"; break;
     }
     return s;
diff --git a/g10/status.h b/g10/status.h
index 840df62ec..9706e3fd7 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -91,6 +91,8 @@
 #define STATUS_USERID_HINT      59
 #define STATUS_UNEXPECTED       60
 #define STATUS_INV_RECP         61
+#define STATUS_NO_RECP          62
+#define STATUS_ALREADY_SIGNED   63
 
 
 /*-- status.c --*/
diff --git a/po/ChangeLog b/po/ChangeLog
index d9b864ee2..c707efee0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-07  Werner Koch  <[email protected]>
+
+	* POTFILES.in: Added new files.
+
 2001-07-26  gettextize  <[email protected]>
 
 	* Makefile.in.in: Upgrade to gettext-0.10.38.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 47d1641ef..df5c9fec2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,7 +39,6 @@ g10/textfilter.c
 g10/tdbio.c
 g10/trustdb.c
 g10/verify.c
-g10/ringedit.c
 g10/skclist.c
 g10/status.c
 g10/pubkey-enc.c
@@ -48,4 +47,5 @@ g10/encr-data.c
 g10/seskey.c
 g10/delkey.c
 g10/helptext.c
-
+g10/keydb.c
+g10/keyring.c
diff --git a/po/da.po b/po/da.po
index 9dc9c855d..04419e6c6 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: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -15,39 +15,39 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "aA"
 
@@ -258,17 +258,17 @@ msgstr "d�rlig offentlig n�gle"
 msgid "unusable secret key"
 msgstr "d�rlig hemmelig n�gle"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en fejl (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -315,16 +315,11 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +344,7 @@ msgstr ""
 "Ikke nok tilf�ldige byte tilg�ngelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +352,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,162 +494,167 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|skriv statusinfo til denne FD"
+
+#: g10/g10.c:332
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,16 +674,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -693,7 +693,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -701,204 +701,214 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "vis pr�ferencer"
+
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1176
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [filnavn]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key bruger-id"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
 "understregning\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -931,7 +941,7 @@ msgstr ""
 msgid "unexpected armor:"
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
@@ -948,7 +958,7 @@ msgstr "for tidlig eof (i CRC)\n"
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
@@ -961,27 +971,23 @@ msgstr "for tidlig eof (i trailer)\n"
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr ""
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 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:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
@@ -1142,59 +1148,59 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger n�gle uden tillid!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1202,109 +1208,130 @@ msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Indtast bruger-id: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 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:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fejl ved unders�gelse af n�gle: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr ""
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "vis pr�ferencer"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Ugyldige bogstaver i navn\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 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:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:756
 #, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (sign�r kun)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1313,19 +1340,19 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1337,42 +1364,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:633
+#: g10/keygen.c:837
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 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:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1382,36 +1409,36 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 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:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1421,44 +1448,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1469,28 +1496,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 #, 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1498,11 +1525,11 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1510,7 +1537,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1518,71 +1545,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan ikke �bne: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
@@ -1592,56 +1639,56 @@ msgstr "%s: ADVARSEL: tom fil\n"
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1651,7 +1698,7 @@ msgstr ""
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
@@ -1721,50 +1768,46 @@ msgstr "hemmelige n�gler import: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, 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:440
+#: g10/import.c:439
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "ingen standard offentlig n�glering\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan ikke l�se n�glering `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
@@ -1774,123 +1817,128 @@ msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "ingen standard offentlig n�glering\n"
+
+#: g10/import.c:652
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1899,721 +1947,779 @@ 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:919
+#: g10/import.c:939
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:928
+#: g10/import.c:948
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: bruger ikke fundet\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "vispr�f"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "vis pr�ferencer"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "vis pr�ferencer"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr ""
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
 #: g10/keyedit.c:964
+msgid "Really update the preferences for the selected user IDs? "
+msgstr ""
+
+#: g10/keyedit.c:966
+msgid "Really update the preferences? "
+msgstr ""
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr ""
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undern�gle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr ""
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr ""
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "krypt�r data"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr ""
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2635,7 +2741,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2648,12 +2754,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -2693,27 +2799,27 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -2721,51 +2827,56 @@ msgstr "Gentag kodes�tning: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "fejl ved l�sning af '%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
@@ -2780,26 +2891,26 @@ msgstr ""
 msgid "can't get key from keyserver: %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2822,57 +2933,62 @@ msgstr ""
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:307
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:308
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:448
+#: g10/sign.c:860
 #, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ADVARSEL: '%s' er en tom fil\n"
+msgid "%s encryption will be used\n"
+msgstr ""
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2884,12 +3000,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2898,113 +3014,118 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
-msgid "%s: can't create: %s\n"
+msgid "%s: can't create lock\n"
 msgstr ""
 
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: kan ikke �bne: %s\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
 #, c-format
-msgid "%s: can't create lock\n"
+msgid "%s: can't create: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
@@ -3055,7 +3176,7 @@ msgstr ""
 
 #: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "'%s' is not a valid long keyID\n"
+msgid "`%s' is not a valid long keyID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
 #: g10/trustdb.c:501
@@ -3088,213 +3209,209 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr ""
 
-#: g10/trustdb.c:584
+#: g10/trustdb.c:585
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr ""
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr ""
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Godt certifikat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr ""
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr ""
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr ""
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr ""
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/trustdb.c:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr ""
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3307,34 +3424,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr ""
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr ""
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr ""
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr ""
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr ""
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr ""
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3408,22 +3497,12 @@ msgstr "%s: mappe oprettet\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr ""
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr ""
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr ""
 
@@ -3436,23 +3515,28 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Slet denne n�gle fra n�gleringen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr ""
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 
@@ -3590,25 +3674,32 @@ msgid ""
 "a second one is available."
 msgstr ""
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
 msgstr ""
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svar \"ja\" hvis det er ok at overskrive filen"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3616,7 +3707,7 @@ msgstr ""
 "Indtast et nyt filnavn. Hvis du bare trykker RETUR vil det\n"
 "forvalgte navn (som er vist i klammer) blive brugt."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3632,22 +3723,76 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "fejl ved skrivning af n�glering `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr ""
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr ""
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr ""
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr ""
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr ""
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (sign�r og krypt�r)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "certifikatl�seproblem: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan ikke l�se n�glering `%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: bruger ikke fundet\n"
+
 #, fuzzy
 #~ msgid "invalid"
 #~ msgstr "ugyldig rustning"
diff --git a/po/de.po b/po/de.po
index f466979af..6d0191c86 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-16 14:20+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -12,42 +12,42 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Warnung: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht m�glich\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 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"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -256,17 +256,17 @@ msgstr "unbrauchbarer �ffentlicher Sch�ssel"
 msgid "unusable secret key"
 msgstr "unbrauchbarer geheimer Schl�ssel"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -314,16 +314,11 @@ msgstr "kann '%s' nicht schreiben: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-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:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +344,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +352,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,161 +494,166 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "verwende den GPG-Agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -662,7 +662,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,17 +682,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -702,7 +702,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -710,192 +710,202 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "Liste der Voreinstellungen"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [Dateiname]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key User-ID"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
 "ein Unterstrich sein\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -903,12 +913,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -941,7 +951,7 @@ msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-H�lle:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
@@ -958,7 +968,7 @@ msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
@@ -971,20 +981,16 @@ msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Weitere Infos: siehe http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -993,7 +999,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
@@ -1184,65 +1190,65 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1250,114 +1256,133 @@ msgstr ""
 "Sie haben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "�bersprungen '%s': doppelt\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "Liste der Voreinstellungen"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Ung�ltiges Zeichen im Namen\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ung�ltig Schl�ssell�nge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 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:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1370,19 +1395,19 @@ msgstr ""
 "              standard Schl�ssell�nge ist 1024 Bit\n"
 "      gr��te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 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:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
 
@@ -1394,12 +1419,12 @@ msgstr "zu kurz; 1024 ist die kleinste f�r RSA 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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1407,11 +1432,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1419,21 +1444,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1449,25 +1474,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:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schl�ssel verf�llt am %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1475,11 +1500,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1495,44 +1520,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1543,27 +1568,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 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:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1571,11 +1596,11 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1588,7 +1613,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1599,29 +1624,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schl�ssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1630,12 +1675,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1643,7 +1688,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1651,26 +1696,26 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
@@ -1680,56 +1725,56 @@ msgstr "%s: WARNUNG: Leere Datei\n"
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: Benutzer nicht gefunden: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "Zertifikat Leseproblem: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1741,7 +1786,7 @@ msgstr ""
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
@@ -1811,50 +1856,46 @@ msgstr "           geheime Schl�ssel importiert: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, 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:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
@@ -1864,130 +1905,135 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 "Geheimer Schl�ssel %08lX nicht importiert (%s verwenden, um das zu "
 "erm�glichen)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, 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:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, 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:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, 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:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1996,99 +2042,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, 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:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: Benutzer nicht gefunden\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 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:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2096,7 +2137,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2104,33 +2145,33 @@ msgstr ""
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2138,7 +2179,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2146,425 +2187,471 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "Liste der Voreinstellungen"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "Liste der Voreinstellungen"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "Fehler beim Lesen von `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 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:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 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:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2573,156 +2660,175 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s verschl�sselte Daten\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s verschl�sselte Daten\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "Enschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2744,7 +2850,7 @@ msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2757,12 +2863,12 @@ msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
@@ -2803,7 +2909,7 @@ msgstr "Abbruch durch Benutzer\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2813,20 +2919,20 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2835,51 +2941,56 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "Fehler beim Lesen von `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, 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:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empf�nger.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "Versch�sselungsverfahren %d ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
@@ -2894,26 +3005,26 @@ msgstr "Schl�ssel %08lX von %s wird angefordert ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "Schl�ssel ist beim Schl�sselserver nicht erh�ltlich: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
@@ -2937,64 +3048,69 @@ msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich ist das Siegel (MDC) BESCH�DIGT (wegen unbekanntem \"critical bit"
 "\")\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "Hinweis: Signaturschl�ssel %08lX ist am %s verfallen.\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3006,12 +3122,12 @@ msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -3020,113 +3136,118 @@ msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu gro�\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: kann nicht erzeugt werden: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: Sperre kann nicht erzeugt werden\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: kann nicht erzeugt werden: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�ltige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
@@ -3178,8 +3299,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ist keine g�ltige Schl�ssel-ID-L�nge\n"
 
 #: g10/trustdb.c:501
@@ -3214,218 +3335,214 @@ msgstr ""
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "HINWEIS: Geheimer Schl�ssel %08lX ist NICHT gesch�tzt.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schl�ssel %08lX.%lu: Korrekte Unterschl�ssel-Anbindung\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Schl�sselwiderruf\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schl�ssel %08lX.%lu: G�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Ung�ltige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "G�ltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Ung�ltiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "G�ltiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Ung�ltiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Ung�ltiges Zertifikat"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einf�gen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingef�gt\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schl�ssel bearbeitet\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schl�ssel mit Fehlern\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schl�ssel eingef�gt\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu wegen neuer Schl�ssel\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schl�ssel �bersprungen\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schl�ssel ge�ndert\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schl�ssel\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, 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:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3441,34 +3558,6 @@ 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:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: Schl�sselbund erstellt\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s ist der Unver�nderte\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s ist der Neue\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3546,23 +3635,13 @@ 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"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s verschl�sselte Daten\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schl�ssel verschl�sselt.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "Problem beim Bearbeiten des verschl�sselten Pakets\n"
 
@@ -3577,23 +3656,28 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
@@ -3803,7 +3887,14 @@ msgstr ""
 "irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar "
 "ist."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3820,23 +3911,23 @@ msgstr ""
 "werden,\n"
 "sind i.d.R. eine gute Wahl"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Um sicher zu gehen, da� Sie sich bei der Eingabe des Mantras nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "�bereinstimmen, wird das Mantra akzeptiert."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr ""
 "Geben Sie den Namen der Datei an, zu dem die abgetrennte Unterschrift geh�rt"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Geben Sie \"ja\" ein, wenn Sie die Datei �berschreiben m�chten"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3845,7 +3936,7 @@ msgstr ""
 "Eingabetaste bet�tigen, wird der (in Klammern angezeigte) Standarddateiname\n"
 "verwendet."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3873,7 +3964,7 @@ msgstr ""
 "      Um bekanntzugeben, da� die User-ID nicht mehr benutzt werden soll.\n"
 "      So weist man normalerweise auf eine ung�ltige E-Mailadresse hin.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3883,15 +3974,85 @@ msgstr ""
 "Sie diesen Widerruf herausgeben.  Der Text sollte m�glichst knapp sein.\n"
 "Eine Leerzeile beendet die Eingabe.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Keine Hilfe vorhanden."
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: Schl�sselbund erstellt\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: Schl�sselbund erstellt\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s ist der Unver�nderte\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s ist der Neue\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "Zu viele Zufallswerte angefordert: Die Grenze liegt bei %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Weitere Infos: siehe http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (signieren/beglaubigen und verschl�sseln)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr ""
+#~ "M�chten Sie wirklich einen Unterschriften-/Verschl�sselungschl�ssel "
+#~ "erzeugen? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: Benutzer nicht gefunden: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "Zertifikat Leseproblem: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: Benutzer nicht gefunden\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
+
 #~ msgid "invalid"
 #~ msgstr "ung�ltig"
 
diff --git a/po/eo.po b/po/eo.po
index 5e3f5969e..9c13c37eb 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-23 20:55+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -13,39 +13,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "fF"
 
@@ -256,17 +256,17 @@ msgstr "malbona publika �losilo"
 msgid "unusable secret key"
 msgstr "malbona sekreta �losilo"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -313,16 +313,11 @@ msgstr "ne povas skribi '%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-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:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -347,7 +342,7 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -355,139 +350,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -497,157 +492,162 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi �i tiun �losilon absolute"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -655,7 +655,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -675,15 +675,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -693,7 +693,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -701,191 +701,201 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "listigi preferojn"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [dosiero]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key uzantidentigilo"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,11 +903,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -930,7 +940,7 @@ msgstr "nevalida strek-eskapita linio: "
 msgid "unexpected armor:"
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
@@ -947,7 +957,7 @@ msgstr "tro frua dosierfino (en CRC)\n"
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
@@ -960,20 +970,16 @@ msgstr "tro frua dosierfino (en vosto)\n"
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Por informoj vidu http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -982,7 +988,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
@@ -1166,61 +1172,61 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan �losilon!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1228,109 +1234,130 @@ msgstr ""
 "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorita: publika �losilo jam difinita per --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: eraro dum kontrolo de �losilo: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "ignoris '%s': ripetita\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "listigi preferojn"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Nevalida signo en nomo\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj �ifri)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (nur subskribi)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1343,19 +1370,19 @@ msgstr ""
 "               implicita �losilgrando estas 1024 bitoj\n"
 " plej granda rekomendata �losilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
 
@@ -1367,12 +1394,12 @@ msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por 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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1380,11 +1407,11 @@ msgstr ""
 "�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "�ar la komputado da�ras TRE longe!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1392,21 +1419,21 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1422,25 +1449,25 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "�losilo neniam eksvalidi�os\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "�losilo eksvalidi�os je %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1448,11 +1475,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1467,44 +1494,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1515,27 +1542,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 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:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1543,11 +1570,11 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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 +1586,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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 +1598,49 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1601,12 +1648,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1614,7 +1661,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1622,26 +1669,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "�u vere krei? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
@@ -1651,55 +1698,55 @@ msgstr "%s: AVERTO: malplena dosiero\n"
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: uzanto ne trovita: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "uzanto '%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - mal�altas\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1709,7 +1756,7 @@ msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu �losiloj jam traktitaj\n"
@@ -1779,50 +1826,46 @@ msgstr "sekretaj �losiloj importitaj: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "mankas implicita publika �losilaro\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "ne povas �losi la �losilaron '%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
@@ -1832,124 +1875,129 @@ msgstr "�losilo %08lX: publika �losilo importita\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "mankas implicita publika �losilaro\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1958,98 +2006,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:919
+#: g10/import.c:939
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: uzanto ne trovita\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Jam subskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2057,7 +2100,7 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2065,33 +2108,33 @@ msgstr ""
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2099,7 +2142,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2107,425 +2150,471 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "listigi preferojn"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "listigi preferojn"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "�u vere krei la revokatestilojn? (j/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 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:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2534,153 +2623,172 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s-�ifritaj datenoj\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "�ifrita per nekonata metodo %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s-�ifritaj datenoj\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fari apartan subskribon"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -2703,7 +2811,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:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -2716,12 +2824,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
@@ -2764,7 +2872,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2774,20 +2882,20 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -2795,52 +2903,57 @@ msgstr "Ripetu pasfrazon: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "ne subskribitan dosieron\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, 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:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -2855,26 +2968,26 @@ msgstr "petas la �losilon %08lX de %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
@@ -2897,59 +3010,64 @@ 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "supozas malbonan sigelon (MDC) pro nekonata \"critical bit\"\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTO: subskribo-�losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "AVERTO: '%s' estas malplena dosiero\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "mal�ifrado malsukcesis: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2961,12 +3079,12 @@ msgstr "ne povas trakti tekstliniojn pli longajn ol %d signojn\n"
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
@@ -2975,113 +3093,118 @@ msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ne povas aliri: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: ne povas krei: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ne povas krei �loson\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: ne povas krei �loson\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: ne povas krei: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la fido-datenaro estas fu�ita; bonvolu ruli \"gpg --fix-trustdb\".\n"
 
@@ -3131,8 +3254,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ne estas valida longa �losilidentigilo\n"
 
 #: g10/trustdb.c:501
@@ -3165,214 +3288,210 @@ msgstr "�losilo %08lX: mankas publika �losilo por fidata �losilo - ignorita\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTO: sekreta �losilo %08lX NE estas protektita.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "�losilo %08lX.%lu: Bona sub�losila bindado\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "�losilo %08lX.%lu: Nevalida sub�losila bindado: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "�losilo %08lX.%lu: Valida �losilrevoko\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "�losilo %08lX.%lu: Nevalida �losilrevoko: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Bona mem-subskribo"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Nevalida mem-subskribo"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Valida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Nevalida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Valida atestilrevoko"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Bona atestilo"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Nevalida atestilrevoko"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Nevalida atestilo"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir malsukcesis: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: en�ovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: en�ovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: en�ovita\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu �losiloj traktitaj\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu �losiloj kun eraroj\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu �losiloj en�ovitaj\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dosieruja registro sen �losilo - ignorita\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pro novaj publikaj �losiloj\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu �losiloj aktualigitaj\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Hu, mankas �losiloj\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Hu, mankas uzantidentigiloj\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, 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:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "�losilo %08lX: en�ovo de fidoregistro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "�losilo %08lX.%lu: en�ovis en fido-datenaron\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "�losilo %08lX.%lu: eksvalidi�is je %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "�losilo %08lX.%lu: fido-kontrolo malsukcesis: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemo dum trovo de '%s' en fido-datenaro: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "uzanto '%s' ne estas en fido-datenaro - en�ovas\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3388,34 +3507,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: ne povas krei �losilaron: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: �losilaro kreita\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s estas la ne�an�ita\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s estas la nova\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3494,23 +3585,13 @@ 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"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s-�ifritaj datenoj\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "�ifrita per nekonata metodo %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
@@ -3525,23 +3606,28 @@ 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:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "listigo de �losilblokoj malsukcesis: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
@@ -3728,7 +3814,14 @@ msgstr ""
 "mem-subskribo estas ial nevalida, kaj dua mem-subskribo estas\n"
 "havebla."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3736,20 +3829,20 @@ msgstr ""
 "Bonvolu doni la pasfrazon; tio estas sekreta frazo, kiu ne\n"
 "estas facile divenebla."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Bonvolu ripeti la pasfrazon, por kontroli, ke vi bone scias, kion vi tajpis."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donu la nomon de la dosiero, al kiu la subskribo apliki�as"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Respondu per \"jes\", se la dosiero estu surskribita"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3757,7 +3850,7 @@ msgstr ""
 "Bonvolu doni novan dosiernomon. Se vi premas nur ENEN, la implicita\n"
 "dosiero (montrita en parentezo) estos uzata."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3785,7 +3878,7 @@ msgstr ""
 "      Uzu �i tion por aserti, ke la uzantidentigilo ne plu estu uzata;\n"
 "      normale oni uzas �i tion por marki retadreson kiel nevalidan.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3795,15 +3888,83 @@ msgstr ""
 "�i tiun revokatestilon. Bonvolu fari �i tiun tekston konciza.\n"
 "Malplena linio finas la tekston.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Nenia helpo disponata"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: �losilaro kreita\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: �losilaro kreita\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s estas la ne�an�ita\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s estas la nova\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "tro da stokastaj bitoj petitaj; la limo estas %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Por informoj vidu http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (subskribi kaj �ifri)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "�u vi vere volas krei subskriban kaj �ifran �losilon? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: uzanto ne trovita: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problemo �e legado de atestilo: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "ne povas �losi la �losilaron '%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: uzanto ne trovita\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: ne povas krei �losilaron: %s\n"
+
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f7ec164f1..d969bacd6 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: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+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"
@@ -22,39 +22,39 @@ msgstr ""
 "mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/"
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 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"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr ""
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr ""
 
@@ -266,17 +266,17 @@ msgstr "Clave p�blica incorrecta"
 msgid "unusable secret key"
 msgstr "Clave secreta incorrecta"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -323,17 +323,12 @@ msgstr "no puede abrirse `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 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:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,7 +354,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -367,140 +362,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -510,169 +505,174 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|DF|escribe informaci�n de estado en descriptor DF"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
 "para las contrase�as"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -692,15 +692,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -710,7 +710,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -718,191 +718,201 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "muestra preferencias"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nombre_fichero]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key-and-public id-usuario"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 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/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -910,11 +920,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 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"
 
@@ -947,7 +957,7 @@ msgstr "L�nea con guiones no v�lida: "
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
@@ -964,7 +974,7 @@ msgstr "Fin de suma de comprobaci�n prematuro\n"
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
@@ -977,20 +987,16 @@ msgstr "fin de fichero prematuro (en el cierre)\n"
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr ""
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -999,7 +1005,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
@@ -1186,62 +1192,62 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con suficientes firmas de "
 "confianza!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1249,109 +1255,130 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave p�blica ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "`%s' ignorado: duplicado\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "Demasiadas preferencias"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Caracter no v�lido en el nombre\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firma)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrado)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:756
 #, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firma y cifrado)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (s�lo firma)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (s�lo cifrado)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Elecci�n no v�lida.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1364,19 +1391,19 @@ msgstr ""
 "        el tama�o por defecto es 1024 bits\n"
 " el tama�o m�ximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 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:622
+#: g10/keygen.c:826
 #, 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"
@@ -1389,12 +1416,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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1402,11 +1429,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:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1415,21 +1442,21 @@ msgstr ""
 "teclado\n"
 "tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "�De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1445,35 +1472,35 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "valor no v�lido\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1491,44 +1518,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Direcci�n no v�lida\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1539,28 +1566,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 #, 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1568,11 +1595,11 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1584,7 +1611,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1597,29 +1624,49 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "no puede bloquearse el anillo secreto: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1628,12 +1675,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1641,7 +1688,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:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1649,26 +1696,26 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
@@ -1678,56 +1725,56 @@ msgstr "%s: ATENCI�N: fichero vac�o\n"
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: usuario no encontrado: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "usuario '%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error leyendo `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usuario no encontrado]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1737,7 +1784,7 @@ msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
@@ -1807,50 +1854,46 @@ msgstr " claves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "no hay anillo p�blico por defecto\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no puede escribirse el anillo: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "no puede bloquearse el anillo `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
@@ -1860,125 +1903,130 @@ msgstr "clave %08lX: clave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "no puede bloquearse el anillo secreto: %s\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, 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:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1987,99 +2035,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: usuario no encontrado\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, 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:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2087,7 +2130,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2095,34 +2138,34 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2130,7 +2173,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2138,425 +2181,469 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+msgid "setpref"
+msgstr ""
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "muestra preferencias"
+
+#: g10/keyedit.c:598
+msgid "updpref"
+msgstr ""
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "muestra preferencias"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "actualizaci�n de confianza fallida: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "�Revocar realmente esta clave? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "�Borrar realmente todos los identificativos seleccionados? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "actualizaci�n de confianza fallida: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no v�lido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev-  incorrectas revocaciones\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma no v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
+
+#: g10/keyedit.c:1869
 #, 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:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2565,153 +2652,172 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "datos cifrados %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "cifrado con algoritmo desconocido %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "datos cifrados %s\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "hace una firma separada"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "hace una firma separada"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase 0x%02x de firma desconocida"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2736,7 +2842,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:1010
+#: g10/parse-packet.c:1027
 #, 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"
@@ -2749,12 +2855,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
@@ -2799,7 +2905,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2809,20 +2915,20 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
@@ -2830,53 +2936,58 @@ msgstr "Repita contrase�a: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "error leyendo `%s': %s\n"
+
+#: g10/plaintext.c:336
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "Firma borrada.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no datos firmados\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 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:153
+#: g10/pubkey-enc.c:176
 #, 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:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave secreta %08lX caducada el %s\n"
@@ -2891,26 +3002,26 @@ msgstr ""
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede escribirse en el anillo: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "'%s' no es un identificativo largo de clave v�lido\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2933,59 +3044,64 @@ msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "asumiendo MDC incorrecto debido a un bit cr�tico desconocido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: clave de la firma %08lX caducada el %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "lectura registro firma fallida: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATENCI�N `%s' es un fichero vac�o\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATENCI�N `%s' es un fichero vac�o\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "descifrado fallido: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2997,12 +3113,12 @@ msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3012,113 +3128,118 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: no puede crearse: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: no puede crearse bloqueo\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: no puede crearse bloqueo\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: no puede crearse: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d no v�lida\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
@@ -3171,7 +3292,7 @@ msgstr "get_dir_record: search_record fallida: %s\n"
 
 #: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "'%s' is not a valid long keyID\n"
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' no es un identificativo largo de clave v�lido\n"
 
 #: g10/trustdb.c:501
@@ -3204,217 +3325,213 @@ msgstr "clave %08lX: clave de confianza sin clave p�blica - ignorada\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave v�lida\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave v�lida\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de subclave v�lida\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Autofirma v�lida"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Autofirma no v�lida"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Revocaci�n de ID de usuario v�lida"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Revocaci�n de ID de usuario no v�lida."
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocaci�n incorrecto"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - eliminado"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserci�n fallida: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "error leyendo registro de directorio: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraci�n bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay ning�n ID de usuario\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: b�squeda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, 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:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, 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:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, 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:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3427,34 +3544,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: no se puede crear el anillo: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: anillo creado\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s es el que no se ha modificado\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s es el nuevo\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Por favor arregle este posible fallo de seguridad\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
@@ -3530,23 +3619,13 @@ msgstr "%s: directorio creado\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "datos cifrados %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "cifrado con algoritmo desconocido %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "elimina campo keyid de los paquetes cifrados"
@@ -3562,23 +3641,28 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "�Eliminar esta clave del anillo? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "enumeraci�n bloques de clave fallido: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
 
@@ -3766,26 +3850,33 @@ msgstr ""
 "por\n"
 "alguna raz�n y hay otra disponible."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
 msgstr "Por favor introduzca la contrase�a"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Repita la �ltima contrase�a para asegurarse de lo que tecle�."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 #, fuzzy
 msgid "Give the name of the file to which the signature applies"
 msgstr "Introduzca el nombre del fichero al que corresponde la firma"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"s�\" para sobreescribir el fichero"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3794,7 +3885,7 @@ msgstr ""
 "por\n"
 "omisi�n (mostrado entre corchetes)."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3810,22 +3901,89 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Ayuda no disponible"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: anillo creado\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: anillo creado\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s es el que no se ha modificado\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s es el nuevo\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Por favor arregle este posible fallo de seguridad\n"
+
+#, fuzzy
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (firma y cifrado)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "�De verdad quiere crear una clave de firma y cifrado? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: usuario no encontrado: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problema en la lectura del certificado: %s\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 "%s: user not found\n"
+#~ msgstr "%s: usuario no encontrado\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr ""
+#~ "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: no se puede crear el anillo: %s\n"
+
 #, fuzzy
 #~ msgid "invalid"
 #~ msgstr "Armadura no v�lida"
@@ -3920,9 +4078,6 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n"
 
-#~ msgid "Too many preferences"
-#~ msgstr "Demasiadas preferencias"
-
 #~ msgid "Too many preference items"
 #~ msgstr "Demasiados �tems de preferencias"
 
@@ -3974,12 +4129,6 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgid "can't write keyblock: %s\n"
 #~ msgstr "no puede escribirse el bloque de claves: %s\n"
 
-#~ msgid "can't lock secret keyring: %s\n"
-#~ msgstr "no puede bloquearse el anillo secreto: %s\n"
-
-#~ msgid "can't write keyring: %s\n"
-#~ msgstr "no puede escribirse el anillo: %s\n"
-
 #, fuzzy
 #~ msgid "encrypted message is valid\n"
 #~ msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
diff --git a/po/et.po b/po/et.po
index 2d3938289..0303d771b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-01-04 12:01+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -13,39 +13,39 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Hoiatus: kasutan ebaturvalist m�lu!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "jah"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "ei"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "v�lju"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "vV"
 
@@ -256,17 +256,17 @@ msgstr "halb avalik v�ti"
 msgid "unusable secret key"
 msgstr "halb salajane v�ti"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... see on viga (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei saa avada: %s\n"
@@ -313,16 +313,11 @@ msgstr "`%s' ei saa kirjutada: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei saa sulgeda: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "sooviti liiga palju juhuslikke bitte; piirang on %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -347,7 +342,7 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -355,139 +350,139 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "kr�pti andmed"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "kr�ptimine kasutades s�mmeetrilist �iffrit"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "salvesta ainult"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "dekr�pti andmed (vaikimisi)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "eemalda v�ti avalike v�tmete hoidlast"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "eemalda v�ti salajaste v�tmete hoidlast"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "n�ita ainult pakettide j�rjendeid"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse v��rtused"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NIMED]|kontrolli usalduse andmebaasi"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend lahti"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -497,157 +492,162 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutuseid"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "loe v�tmed failist"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega �iffri algoritmi NIMI"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �iffri algoritmi NIMI"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -655,7 +655,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -675,15 +675,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -693,7 +693,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -701,191 +701,201 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "konfliktsed k�sud\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �iffri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "anti vigane poliisi URL\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "n�ita eelistusi"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [failinimi]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key kasutaja-id"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key kasutaja-id"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key kasutaja-id"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ei saa avada: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatel�hendi algoritm `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei saa avada\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,12 +903,12 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
@@ -931,7 +941,7 @@ msgstr "vigane kriipsudega m�rgitud rida: "
 msgid "unexpected armor:"
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "j�tsin vigase radix64 s�mboli %02x vahele\n"
@@ -948,7 +958,7 @@ msgstr "enneaegne failil�pp (poolik CRC)\n"
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC viga; %06lx - %06lx\n"
@@ -961,20 +971,16 @@ msgstr "enneaegne failil�pp (l�petaval real)\n"
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Infot saate lehelt http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "OpenPGP andmeid pole.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -982,7 +988,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "               S�rmej�lg:"
 
@@ -1165,60 +1171,60 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "HOIATUS: Kasutan mitteusaldatavat v�tit!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: seda v�tit ei ole sertifitseeritud usaldatava allkirjaga\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseerinud piisavalt usaldatav allkiri!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1226,109 +1232,130 @@ msgstr ""
 "Te ei m��ranud kasutaja IDd. (te v�ite kasutada v�tit \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Sisestage kasutaja ID: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Sellist kasutaja ID pole.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "j�tsin vahele: avalik v�ti on juba seatud v�tmega --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: viga v�tme kontrollimisel: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "j�i vahele %s: dubleeritud\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "n�ita eelistusi"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Lubamatu s�mbol nimes\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/keygen.c:572
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "Kas te soovite t�esti luua allkirjastamise ja kr�ptimise v�tit? "
-
-#: g10/keygen.c:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1341,19 +1368,19 @@ msgstr ""
 "            vaikimisi v�tmepikkus on 1024 bitti\n"
 "    suurim soovitatav v�tmepikkus on 2048 bitti\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA lubab v�tmepikkuseid ainult alates 512 kuni 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "v�tmepikkus on liiga v�ike; 768 on v�ikseim lubatud v��rtus.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
 
@@ -1365,12 +1392,12 @@ msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\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:633
+#: g10/keygen.c:837
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "v�rmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1378,11 +1405,11 @@ msgstr ""
 "Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
 "arvutused v�tavad V�GA palju aega!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1390,21 +1417,21 @@ msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Kas te t�esti soovite nii pikka v�tit? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1420,25 +1447,25 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "V�ti ei aegu kunagi\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "V�ti aegub %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1446,11 +1473,11 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1465,44 +1492,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "See ei ole kehtiv e-posti aadress\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1513,27 +1540,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1541,11 +1568,11 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "parooli ei korratud �ieti; proovige uuesti.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1557,7 +1584,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1569,29 +1596,49 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1600,43 +1647,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ei saa avada: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: HOIATUS: t�hi fail\n"
@@ -1646,55 +1693,55 @@ msgstr "%s: HOIATUS: t�hi fail\n"
 msgid "reading from `%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s kr�ptitud kasutajale: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: kasutajat ei leitud: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "kasutajat '%s' ei leitud: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "probleem sertifikaadi lugemisel: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
 
-#: g10/export.c:182
+#: g10/export.c:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[Kasutaja id ei leitud]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -1704,7 +1751,7 @@ msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu v�tit on seni t��deldud\n"
@@ -1774,50 +1821,46 @@ msgstr " salajasi v�tmeid imporditud: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "puudub avalike v�tmete vaikimisi v�tmehoidla\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "v�tmehoidlat `%s' ei saa lukustada: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
@@ -1827,124 +1870,129 @@ msgstr "v�ti %08lX: avalik v�ti on imporditud\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei saa lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "v�ti %08lX: 1 uus kasutaja ID\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "v�ti %08lX: %d uut kasutaja IDd\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "v�ti %08lX: 1 uus allkiri\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "v�ti %08lX: %d uut allkirja\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "v�ti %08lX: 1 uus alamv�ti\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "v�ti %08lX: %d uut alamv�tit\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "v�ti %08lX: ei muudetud\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "puudub avalike v�tmete vaikimisi v�tmehoidla\n"
+
+#: g10/import.c:652
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
 #. we can't merge secret keys
-#: g10/import.c:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "v�ti %08lX: vigane iseenda allkiri\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
@@ -1953,98 +2001,93 @@ msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:919
+#: g10/import.c:939
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:928
+#: g10/import.c:948
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "v�ti %08lX: meie koopial puudub iseenda allkiri\n"
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: kasutajat ei leitud\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "On juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2052,7 +2095,7 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2060,33 +2103,33 @@ msgstr ""
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei saa toimetada: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2094,7 +2137,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2102,425 +2145,471 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "n�ita eelistusi"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "n�ita eelistusi"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "n�ita eelistusi"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#. check that they match
-#. fixme: check that they both match
-#: g10/keyedit.c:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "trustdb uuendamine eba�nnestus: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "trustdb uuendamine eba�nnestus: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle hea allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2529,153 +2618,172 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   allkirjastanud %08lX %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [aegub: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s kr�ptitud andmed\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "kr�ptitud tundmatu algoritmiga %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�ptitud andmed: hea DEK\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "kr�ptitud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "kr�ptitud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�ptimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s kr�ptitud andmed\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "lahtikr�ptimine �nnestus\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�ptitud teadet on muudetud!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�ptimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Noteering: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Poliis: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Hea allkiri kasutajalt \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -2699,7 +2807,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -2712,12 +2820,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (peamise v�tme ID %08lX)"
@@ -2761,7 +2869,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2771,20 +2879,20 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -2792,51 +2900,56 @@ msgstr "Korrake parooli: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "�iffri algoritm %d on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "M�RKUS: �iffri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -2851,26 +2964,26 @@ msgstr "k�sin v�tit %08lX serverist %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "v�tmeserverist ei saa v�tit: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "v�tmeserver puudub (kasutage v�tit --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ei ole kehtiv v�tme ID\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "teate saatmine serverile `%s' �nnestus (olek=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
@@ -2892,58 +3005,63 @@ msgstr "Vigane parool; palun proovige uuesti ...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "HOIATUS: Tuvastasin n�rga v�tme - palun muutke uuesti parooli.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "oletan tundmatu kriitilise biti t�ttu vigast MDC\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "see on PGP genereeritud ElGamal v�ti ja EI OLE allkirjastamiseks turvaline!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:307
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "avalik v�ti on %lu sekund uuem, kui allkiri\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:308
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
 
-#: g10/sig-check.c:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s allkiri kasutajalt: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "HOIATUS: `%s' on t�hi fail\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ei saa luua: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "HOIATUS: `%s' on t�hi fail\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "lahtikr�ptimine eba�nnestus: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2955,12 +3073,12 @@ msgstr "ei suuda k�sitleda tekstiridu mis on pikemad, kui %d s�mbolit\n"
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -2969,113 +3087,118 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ei saa kasutada: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: ei saa luua: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: lukku ei �nnestu luua\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: lukku ei �nnestu luua\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: ei saa luua: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei �nnestu: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine eba�nnestus: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
@@ -3125,8 +3248,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record eba�nnestus: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ei ole kehtiv pikk v�tmeID\n"
 
 #: g10/trustdb.c:501
@@ -3159,214 +3282,210 @@ msgstr "v�ti %08lX: usaldataval v�tmel pole avalikku v�tit - j�tsin vahele\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "M�RKUS: salajane v�ti %08lX EI OLE kaitstud.\n"
 
-#: g10/trustdb.c:584
+#: g10/trustdb.c:585
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "v�ti %08lX: salajane ja avalik v�ti ei sobi\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "salajaste v�tmete loendamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "v�ti %08lX.%lu: Hea alamv�tme seos\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "v�ti %08lX.%lu: Vigane alamv�tme seos: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "v�ti %08lX.%lu: kehtiv v�tme t�histamine\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "v�ti %08lX.%lu: Vigane v�tme t�histamine: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "v�ti %08lX.%lu: Kehtiv alamv�tme t�histamine\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Hea iseenda allkiri"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Vigane iseenda allkiri"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "J�tsin kehtiva kasutaja ID t�histuse vahele, kuna leidub uuem iseenda allkiri"
 
-#: g10/trustdb.c:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Kehtiv kasutaja ID t�histamine"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Vigane kasutaja ID t�histamine"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Kehtiv sertifikaadi t�histus"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Hea sertifikaat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Vigane sertifikaadi t�histus"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Vigane sertifikaat"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "allkirjakirje %lu[%d] viitab valele kirjele.\n"
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "duplikaat sertifikaat - kustutasin"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir eba�nnestus: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: lisamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: lisamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: lisatud\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "viga kataloogikirje lugemisel: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu v�tit on t��deldud\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu vigadega v�tit\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu v�tit lisatud\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "v�tmeblokkide loendamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: kataloogikirje ilma v�tmeta - j�tsin vahele\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu uut avalikku v�tit\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu v�tit j�etud vahele\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu v�tit uuendatud\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, v�tmeid pole\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, puudub kasutaja ID\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: kataloogikirje otsimine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "v�ti %08lX: usalduse kirje lisamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "v�ti %08lX.%lu: lisatud trustdb faili\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "v�ti %08lX.%lu: loodud tulevikus (aja h�pe v�i kella probleem)\n"
 
-#: g10/trustdb.c:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "v�ti %08lX.%lu: aegus %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "v�ti %08lX.%lu: usalduse kontroll eba�nnestus: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "kasutajat '%s' ei leitud: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "probleem '%s' trustdbst leidmisel: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "kasutaja '%s' puudub trustdb failis - lisan\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "'%s' trustdb faili lisamine eba�nnestus: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "HOIATUS: ei k�sitle veel pikki eelistuste kirjeid\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3382,34 +3501,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "sisendrida %u on liiga pikk v�i seavahetus puudub\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: v�tmehoidlat ei �nnestu luua: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: v�tmehoidla on loodud\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s ei ole muudetud\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s on uus\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Palun parandage see v�imalik turvaprobleem\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3486,22 +3577,12 @@ msgstr "%s: kataloog on loodud\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s kr�ptitud andmed\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "kr�ptitud tundmatu algoritmiga %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �iffri n�rga v�tmega.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "�ra lisa kr�ptimisel v�tme id"
@@ -3516,23 +3597,28 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "s�mmeetrilises �iffris ei �nnestu v�ltida n�rka v�tit; proovisin %d korda!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "pakettmoodis ei saa seda teha ilma v�tmeta \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Kustutan selle v�tme v�tmehoidlast? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "v�tmeblokkide loendamine eba�nnestus: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "selle avaliku v�tme jaoks on salajane v�ti!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-key\".\n"
 
@@ -3715,7 +3801,14 @@ msgstr ""
 "vaid siis, kui see allkiri ei ole miskip�rast kehtiv ja on\n"
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3723,19 +3816,19 @@ msgstr ""
 "Palun sisestage parool; see on salajane tekst\n"
 "  Bl��, bl��,.... "
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Palun korrake parooli, siis saate oma kirjutatus kindel olla."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Sisestage palun failinimi, mida allkirjastada"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Vastake \"jah\", kui faili v�ib �le kirjutada"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3743,7 +3836,7 @@ msgstr ""
 "Palun sisestage uus failinimi. Kui te vajutate lihtsalt reavahetust,\n"
 "kasutatakse vaikimisi faili (nimi on nurksulgudes)."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3772,7 +3865,7 @@ msgstr ""
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3782,15 +3875,83 @@ msgstr ""
 "soovite seda t�histamise sertifikaati esitada. Palun kirjutage\n"
 "l�hidalt. T�hi rida l�petab teksti.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Abiinfo puudub"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: v�tmehoidla on loodud\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: v�tmehoidla on loodud\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s ei ole muudetud\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s on uus\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Palun parandage see v�imalik turvaprobleem\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "sooviti liiga palju juhuslikke bitte; piirang on %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Infot saate lehelt http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Kas te soovite t�esti luua allkirjastamise ja kr�ptimise v�tit? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: kasutajat ei leitud: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "probleem sertifikaadi lugemisel: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "v�tmehoidlat `%s' ei saa lukustada: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: kasutajat ei leitud\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "HOIATUS: ei k�sitle veel pikki eelistuste kirjeid\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: v�tmehoidlat ei �nnestu luua: %s\n"
+
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "selles versioonis ei saa RSA v�tit kasutada\n"
 
diff --git a/po/fr.po b/po/fr.po
index 10cd8cebe..7b6f79ade 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4t\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-24 17:46+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -18,41 +18,41 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Avertissement: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 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"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -261,17 +261,17 @@ msgstr "cl� publique inutilisable"
 msgid "unusable secret key"
 msgstr "cl� secr�te inutilisable"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -320,19 +320,12 @@ msgstr "impossible d'�crire `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
-"une quantit� de donn�es al�atoires trop importante a �t� demand�e.\n"
-"La limite est %d bits.\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 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:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -357,7 +350,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -365,139 +358,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "enlever la cl� du porte-cl�s secret"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -507,157 +500,162 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "utiliser gpg-agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|�crire l'�tat sur ce descripteur"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCL�|donner une confiance ultime � cette cl�"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -665,7 +663,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -685,17 +683,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -705,7 +703,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -713,192 +711,202 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "lister les pr�f�rences"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nom du fichier]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key utilisateur"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -907,13 +915,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent �tre entour�s d'autes "
 "caract�res\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 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"
 
@@ -946,7 +954,7 @@ msgstr "ligne �chapp�e par `-' invalide: "
 msgid "unexpected armor:"
 msgstr "armure inattendue:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02x invalide en base 64 ignor�\n"
@@ -963,7 +971,7 @@ msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC; %06lx - %06lx\n"
@@ -976,20 +984,16 @@ msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Pour information voir http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -998,7 +1002,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
@@ -1183,64 +1187,64 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1248,113 +1252,134 @@ msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignor�: cl� publique configur�e par --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erreur pendant la v�rification de la cl�: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "`%s' a �t� ignor�: dupliqu�\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "lister les pr�f�rences"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Caract�re invalide dans le nom\n"
+
 # g10/keygen.c:123 ???
-#: g10/keygen.c:176
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "�criture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (signature et chiffrement)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (chiffrement seul)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "L'utilisation de cet algorithme est d�conseill� - faut-il quand-m�me\n"
 "cr�er la cl� ?"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1367,19 +1392,19 @@ msgstr ""
 "          la taille par d�faut est 1024 bits\n"
 " la taille maximale conseill�e est 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 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:622
+#: g10/keygen.c:826
 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"
 
@@ -1391,12 +1416,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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1404,11 +1429,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:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1416,21 +1441,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous r�ellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1446,25 +1471,25 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ans\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1472,11 +1497,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:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1492,44 +1517,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 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:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1540,28 +1565,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 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:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1569,11 +1594,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 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:970
+#: g10/keygen.c:1176
 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"
@@ -1585,7 +1610,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1597,29 +1622,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: g10/keygen.c:1939
 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:1684
+#: g10/keygen.c:1945
 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"
@@ -1628,13 +1673,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, 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:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1642,7 +1687,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:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1650,26 +1695,26 @@ 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:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
@@ -1679,57 +1724,57 @@ msgstr "%s: ATTENTION: fichier vide\n"
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: utilisateur non trouv�: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "l'utilisateur '%s' n'a pas �t� 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1739,7 +1784,7 @@ msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
@@ -1809,50 +1854,46 @@ msgstr "       cl�s secr�tes import�es: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "pas de porte-cl�s public par d�faut\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "cl� %08lX: cl� publique import�e\n"
@@ -1862,125 +1903,130 @@ msgstr "cl� %08lX: cl� publique import�e\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "cl� %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "cl� %08lX: une nouvelle signature\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "cl� %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "cl� %08lX: une nouvelle sous-cl�\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr "cl� secr�te %08lX non import�e (utilisez %s pour l'accepter)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "pas de porte-cl�s public par d�faut\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, 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:649
+#: g10/import.c:661
 #, 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:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX: certificat de r�vocation import�\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX: auto-signature invalide\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, 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:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, 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:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -1989,98 +2035,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utilisateur non trouv�\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 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:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 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:231
+#: g10/keyedit.c:209
 #, 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:233
+#: g10/keyedit.c:211
 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:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "D�j� sign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2088,7 +2129,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2096,39 +2137,39 @@ msgstr ""
 "La signature sera marqu�e comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 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:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 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:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2137,425 +2178,471 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 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:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "lister les pr�f�rences"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "lister les pr�f�rences"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pr�f"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "lister les pr�f�rences"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, 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:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 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:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 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:1007
+#: g10/keyedit.c:1037
+#, 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:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  cr��e: %s expire: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2564,151 +2651,170 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   sign� par %08lX � %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 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:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "donn�es chiffr�es avec %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "chiffr� avec l'algorithme inconnu %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffr� avec une cl� %s, %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "donn�es chiffr�es avec %s\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2733,7 +2839,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:1010
+#: g10/parse-packet.c:1027
 #, 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"
@@ -2746,12 +2852,12 @@ msgstr "gpg-agent n'est pas disponible dans cette session\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
@@ -2793,7 +2899,7 @@ msgstr "annul� par l'utilisateur\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2803,20 +2909,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -2826,53 +2932,58 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "erreur pendant la lecture de `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, 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:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le r�cipient anonyme.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 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:153
+#: g10/pubkey-enc.c:176
 #, 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:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
@@ -2887,26 +2998,26 @@ msgstr "requ�te de la cl� %08lX de %s...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "aucun serveur de cl�s n'est connu (utilisez l'option �--keyserver�)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: l'identification de la cl� est invalide\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
@@ -2928,61 +3039,66 @@ msgstr "Mot de passe invalide; r�essayez...\n"
 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "le sceau (MDC) est suppos� �tre faux car un bit critique est inconnu\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: la cl� de signature %08lX a expir� le %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENTION: `%s' est un fichier vide\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENTION: `%s' est un fichier vide\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "le d�chiffrement a �chou�: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2994,12 +3110,12 @@ msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -3009,115 +3125,120 @@ msgstr ""
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossible d'acc�der: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: impossible de cr�er: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossible de cr�er le verrouillage\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: impossible de cr�er le verrouillage\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: impossible de cr�er: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: impossible de cr�er un enregistrement de version: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de confiance cr��e\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de confiance invalide\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erreur pendant la mise � jour de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erreur pendant l'�criture de l'enregistrement de version: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance: �lseek()� a �chou�: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s: erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: n'a pu mettre un enregistrement � z�ro: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: impossible d'ajouter un enregistrement: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
@@ -3171,8 +3292,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record a �chou�: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' n'est pas une identification de cl� longue valide\n"
 
 #: g10/trustdb.c:501
@@ -3205,222 +3326,216 @@ msgstr "cl� %08lX: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 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:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "cl� %08lX.%lu: bonne liaison avec la sous-cl�\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "cl� %08lX.%lu: r�vocation de cl� valide\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "cl� %08lX.%lu: r�vocation de sous-cl� valide\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "R�vocation de nom d'utilisateur valide"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "R�vocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Certificat de r�vocation valide"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "R�vocation de certificat invalide"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "certificat dupliqu� - supprim�"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a �chou�: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: l'insertion a �chou�: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: l'insertion a �chou�: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ins�r�\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, 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:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu cl�s trait�es\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu cl�s avec erreurs\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu cl�s ins�r�es\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'�num�ration des blocs de cl�s a �chou�: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu � cause de nouvelles cl�s publiques\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu cl�s ignor�es\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu cl�s mises � jour\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de cl�\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, 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:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, 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:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "cl� %08lX.%lu: a expir� le %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, 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:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas �t� trouv�: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, 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:2586
+#: g10/trustdb.c:2529
 #, 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:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr ""
-"ATTENTION: les enregistrements de pr�f�rences longs ne sont pas encore\n"
-"support�s\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3438,35 +3553,6 @@ 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:302
-#, 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:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: porte-cl�s cr��\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr ""
-"ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s est le fichier original\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s est le nouveau\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "R�parez ce probl�me de s�curit� possible\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3545,24 +3631,14 @@ msgstr ""
 "vous devez red�marrer GnuPG pour qu'il puisse lire le nouveau\n"
 "fichier �options�\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "donn�es chiffr�es avec %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "chiffr� avec l'algorithme inconnu %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "probl�me de gestion des paquets chiffr�s\n"
 
@@ -3577,23 +3653,28 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Enlever cette cl� du porte-cl�s ? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "l'�num�ration des blocs de cl�s a �chou�: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
 
@@ -3783,7 +3864,14 @@ msgstr ""
 "cette auto-signature est invalide pour une certaine raison et si une autre\n"
 "est disponible."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3791,20 +3879,20 @@ msgstr ""
 "Entrez le mot de passe; c'est une phrase secr�te \n"
 "  Blurb, blurb,.... "
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "R�p�tez le dernier mot de passe pour �tre s�r de ce que vous avez tap�."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "R�pondez �oui� s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3812,7 +3900,7 @@ msgstr ""
 "Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
 "fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3841,7 +3929,7 @@ msgstr ""
 "      utilis�. Cela sert g�n�ralement � indiquer qu'une adresse e-mail\n"
 "      est invalide.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3851,11 +3939,85 @@ msgstr ""
 "avez �mis ce certificat de r�vocation. Essayez de garder ce texte concis.\n"
 "Une ligne vide d�limite la fin du texte.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: porte-cl�s cr��\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: porte-cl�s cr��\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr ""
+"ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s est le fichier original\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s est le nouveau\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "R�parez ce probl�me de s�curit� possible\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr ""
+#~ "une quantit� de donn�es al�atoires trop importante a �t� demand�e.\n"
+#~ "La limite est %d bits.\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Pour information voir http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (signature et chiffrement)\n"
+
+#~ 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 ? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: utilisateur non trouv�: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "probl�me lors de lecture du certificat: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utilisateur non trouv�\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr ""
+#~ "ATTENTION: les enregistrements de pr�f�rences longs ne sont pas encore\n"
+#~ "support�s\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: impossible de cr�er le porte-cl�s: %s\n"
diff --git a/po/id.po b/po/id.po
index f180ca488..19a933221 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUPG 1.0.6\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-06-01 16:41GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -14,39 +14,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "ya"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "tidak"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "keluar"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "kK"
 
@@ -255,17 +255,17 @@ msgstr "kunci publik tidak dapat dipakai"
 msgid "unusable secret key"
 msgstr "kunci rahasia tidak dapat dipakai"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... kesalahan (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -312,16 +312,11 @@ msgstr "tidak dapat menulis `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "terlalu banyak permintaan random bit; batasnya adalah %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -346,7 +341,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -354,139 +349,139 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -496,156 +491,161 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|tulis info status ke FD ini"
+
+#: g10/g10.c:332
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -653,7 +653,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -673,15 +673,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -691,7 +691,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -699,190 +699,200 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "tampilkan preferensi"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [namafile]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key id-user"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -890,11 +900,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -927,7 +937,7 @@ msgstr "dash escaped line tidak valid: "
 msgid "unexpected armor:"
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
@@ -944,7 +954,7 @@ msgstr "eof prematur (dalam CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
@@ -957,20 +967,16 @@ msgstr "eof prematur (dalam Trailer)\n"
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Untuk info lihat http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -979,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:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
@@ -1161,169 +1167,190 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "        Mungkin signature adalah palsu.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Masukkan ID user: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "lewati `%s': terduplikasi\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "tampilkan preferensi"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Karakter tidak valid dalam nama\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "  (%d) RSA (tandai dan enkripsi)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "  (%d) ElGamal (hanya enkripsi)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:572
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "Anda ingin membuat kunci sign dan enkripsi? "
-
-#: g10/keygen.c:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1336,19 +1363,19 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
@@ -1361,12 +1388,12 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1374,11 +1401,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,21 +1413,21 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,25 +1443,25 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1442,11 +1469,11 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1461,44 +1488,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1508,27 +1535,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1536,11 +1563,11 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1552,7 +1579,7 @@ msgstr ""
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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 +1591,49 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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,45 +1642,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, 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:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, 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:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat dibuka: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
@@ -1643,55 +1690,55 @@ msgstr "%s: PERINGATAN: file kosong\n"
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: user tidak ditemukan: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "masalah pembacaan sertifikat: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1701,7 +1748,7 @@ msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
@@ -1771,50 +1818,46 @@ msgstr "  kunci rahasia diimpor: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "tidak ada keyring publik baku\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "tidak dapat mengunci keyring `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
@@ -1824,125 +1867,130 @@ msgstr "kunci %08lX: kunci publik diimpor\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr "kunci rahasia %08lX tidak diimpor (gunakan %s untuk memungkinkannya)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "tidak ada keyring publik baku\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1951,98 +1999,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: user tidak ditemukan\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2050,7 +2093,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2058,33 +2101,33 @@ msgstr ""
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2092,7 +2135,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2100,575 +2143,640 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "tampilkan preferensi"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "tampilkan preferensi"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "tampilkan preferensi"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "gagal perbarui trustdb: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Hapus seluruh ID user terpilih? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "gagal perbarui trustdb: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " kepercayaan: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Anda harus memilih minimum satu ID user.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [berakhir: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s data terenkripsi\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s data terenkripsi\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -2691,7 +2799,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -2704,12 +2812,12 @@ msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
@@ -2750,7 +2858,7 @@ msgstr "dibatalkan oleh user\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2760,20 +2868,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -2781,51 +2889,56 @@ msgstr "Ulangi passphrase: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritma cipher %d tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -2840,26 +2953,26 @@ msgstr "meminta kunci %08lX dari %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "tidak dapat memperoleh kunci keyserver: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "tidak ada keyserver yang dikenal (gunakan option --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: bukanlah ID kunci yang valid\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukses mengirim ke '%s' (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "gagal mengirim ke '%s': status=%u\n"
@@ -2881,58 +2994,63 @@ msgstr "Passphrase tidak valid; silakan coba lagi ...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan rubah passphrase lagi.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "CATATAN: kunci signature %08lX berakhir %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "PERINGATAN: `%s' adalah file kosong\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "PERINGATAN: `%s' adalah file kosong\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "gagal dekripsi: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2944,12 +3062,12 @@ msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: gagal menulis (n=%d): %s\n"
@@ -2958,113 +3076,118 @@ msgstr "trustdb rec %lu: gagal menulis (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: tidak dapat akses: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: tidak dapat membuat: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: tidak dapat membuat lock\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: tidak dapat membuat lock\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: tidak dapat membuat: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: gagal membaca (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
@@ -3114,8 +3237,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: gagal search_record: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' bukanlah keyID panjang yang valid\n"
 
 #: g10/trustdb.c:501
@@ -3148,214 +3271,210 @@ msgstr "kunci %08lX: tidak ada kunci publik untuk trusted key- dilewati\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "gagal enumerasi kunci rahasia: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "kunci %08lX.%lu: binding subkey baik\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "kunci %08lX.%lu: binding subkey tidak valid: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci valid\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci tidak valid: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan subkey valid\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Self-signature yang baik"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Self-signature tidak valid"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Pembatalan ID user valid"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Pembatalan ID user tidak valid"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Pembatalan sertifikat valid"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Sertifikat yang baik"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Pembatalan sertifikat tidak valid"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Sertifikat tidak valid"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "sertifikat ganda - dihapus"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir gagal: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: menyisipkan\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "kesalahan membaca dir record: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kunci diproses\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kunci dengan kesalahan\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "%lu kunci disisipkan\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "gagal enumerasi keyblok: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record tanpa kunci - dilewati\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pubkey baru\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%lu kunci dilewati\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "%lu kunci diperbaharui\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, tanpa kunci\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, tanpa ID user\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: gagal mencari di record: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "kunci %08lX: gagal menyisipkan record trust: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "kunci %08lX.%lu: menyisipkan ke trustdb\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "kunci %08lX.%lu: berakhir pada %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "kunci %08lX.%lu: gagal periksa trust: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "masalah menemukan '%s' dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "pemakai '%s' tidak ada di trustdb - menyisipkan\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3371,34 +3490,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "baris input %u terlalu panjang atau hilang LF\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: tidak dapat membuat keyring: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: keyring tercipta\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s adalah yang tidak berubah\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s adalah yang baru\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3476,23 +3567,13 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s data terenkripsi\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "masalah menangani paket terenkripsi\n"
 
@@ -3506,23 +3587,28 @@ 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:114
+#: g10/delkey.c:116
 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:138
 msgid "Delete this key from the keyring? "
 msgstr "Menghapus kunci ini dari keyring? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "gagal enumerasi keyblok: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
@@ -3708,7 +3794,14 @@ msgstr ""
 "ini bila self-signature untuk beberapa alasan tidak valid dan\n"
 "tersedia yang kedua."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3716,20 +3809,20 @@ msgstr ""
 "Silakan masukkan passphrase; ini kalimat rahasia\n"
 "   Blurb, blurb,...."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file untuk mengaplikasikan signature"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Jawab \"ya\" jika ingin menimpa file"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3737,7 +3830,7 @@ msgstr ""
 "Silakan masukan nama file baru. Jika anda hanya menekan RETURN nama\n"
 "file baku (yang diapit tanda kurung) akan dipakai."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3767,7 +3860,7 @@ msgstr ""
 "      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
 "lagi.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3777,11 +3870,79 @@ msgstr ""
 "mengeluarkan sertifikat pembatalan ini. Buatlah ringkas.\n"
 "Baris kosong mengakhiri teks.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Tidak tersedia bantuan"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
+
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: keyring tercipta\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring tercipta\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s adalah yang tidak berubah\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s adalah yang baru\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "terlalu banyak permintaan random bit; batasnya adalah %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Untuk info lihat http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "  (%d) RSA (tandai dan enkripsi)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Anda ingin membuat kunci sign dan enkripsi? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: user tidak ditemukan: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "masalah pembacaan sertifikat: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "tidak dapat mengunci keyring `%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: user tidak ditemukan\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: tidak dapat membuat keyring: %s\n"
diff --git a/po/it.po b/po/it.po
index 60d992b2d..8a037de98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.5\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-23 21:15+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -13,39 +13,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -255,17 +255,17 @@ msgstr "chiave pubblica inutilizzabile"
 msgid "unusable secret key"
 msgstr "chiave segreta inutilizzabile"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo � un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -313,17 +313,12 @@ msgstr "impossibile scrivere su `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "sono stati richiesti troppi bit casuali; il limite � %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +344,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +352,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,159 +494,164 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|scrivi le informazioni di stato su questo FD"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -659,7 +659,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -679,15 +679,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -697,7 +697,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -705,192 +705,202 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "elenca le impostazioni"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nomefile]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key user-id"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,11 +908,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -935,7 +945,7 @@ msgstr "riga protetta con il trattino non valida: "
 msgid "unexpected armor:"
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
@@ -952,7 +962,7 @@ msgstr "eof prematura (nel CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
@@ -965,20 +975,16 @@ msgstr "eof prematura (nella coda)\n"
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Per informazioni si veda http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -987,7 +993,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
@@ -1170,61 +1176,61 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1232,109 +1238,130 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica gi� impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "saltata `%s': doppia\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "elenca le impostazioni"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Carattere non valido nel nome\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (firma e cifra)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (firma solo)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo � deprecato - la creo comunque? "
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1347,19 +1374,19 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
 
@@ -1371,12 +1398,12 @@ msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per 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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1384,11 +1411,11 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1396,21 +1423,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave cos� lunga? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1426,25 +1453,25 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1452,11 +1479,11 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1472,44 +1499,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1520,27 +1547,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1548,11 +1575,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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 +1591,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1576,29 +1603,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1607,12 +1654,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1620,7 +1667,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1628,26 +1675,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
@@ -1657,55 +1704,55 @@ msgstr "%s: ATTENZIONE: file vuoto\n"
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: utente non trovato: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "utente `%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "errore leggendo `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1715,7 +1762,7 @@ msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
@@ -1785,50 +1832,46 @@ msgstr "chiavi segrete importate: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "nessun portachiavi pubblico predefinito\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
@@ -1838,126 +1881,131 @@ msgstr "chiave %08lX: chiave pubblica importata\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 "la chiave segreta %08lX non � stata importata (usa %s per permetterlo)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "nessun portachiavi pubblico predefinito\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, 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:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1966,98 +2014,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utente non trovato\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2065,7 +2108,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2073,33 +2116,33 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2107,7 +2150,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2115,425 +2158,471 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "elenca le impostazioni"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "elenca le impostazioni"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Tolgo davvero tutti gli user ID selezionati? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Creare davvero i certificati di revoca? (s/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "aggiornamento del trustdb fallito: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Devi selezionare almeno un user ID.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2543,151 +2632,170 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr "[scadenza: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dati cifrati con %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "cifrato con l'algoritmo sconosciuto %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "dati cifrati con %s\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2710,7 +2818,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:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2723,12 +2831,12 @@ msgstr "gpg-agent non � disponibile in questa sessione\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
@@ -2769,7 +2877,7 @@ msgstr "interrotto dall'utente\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2779,20 +2887,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -2801,52 +2909,57 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "errore leggendo `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d � sconosciuto o disabilitato\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -2861,26 +2974,26 @@ msgstr "richiedo la chiave %08lX a %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossibile scaricare la chiave dal keyserver: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "non conosco nessun keyserver (usa l'opzione --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: non � un key ID valido\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "inviata con successo a `%s' (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "invio a `%s' fallito: status=%u\n"
@@ -2904,59 +3017,64 @@ msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chiave per firmare %08lX scaduta il %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "decifratura fallita: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2968,12 +3086,12 @@ msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
@@ -2982,113 +3100,118 @@ msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile acedere a: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: impossibile creare: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossibile creare il lock\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: impossibile creare il lock\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: impossibile creare: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
@@ -3140,8 +3263,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallito: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' non � un key ID lungo valido\n"
 
 #: g10/trustdb.c:501
@@ -3175,216 +3298,212 @@ msgstr ""
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la chiave segreta %08lX NON � protetta.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumerate secret keys fallito: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Revoca dell'user ID valida"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "certificato doppio - cancellato"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallita: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserito\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "errore durante la lettura del dir record: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record senza chiave - saltato\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu a causa di nuove chiavi pubbliche\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non � nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3400,34 +3519,6 @@ 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:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: impossibile creare il portachiavi: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: portachiavi creato\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s � quello non modificato\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s � quello nuovo\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3506,24 +3597,14 @@ msgstr ""
 "� necessario eseguire di nuovo GnuPG in modo che possa leggere il nuovo\n"
 "file delle opzioni\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dati cifrati con %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "cifrato con l'algoritmo sconosciuto %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "problema nella gestione del pacchetto cifrato\n"
 
@@ -3538,23 +3619,28 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 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:138
 msgid "Delete this key from the keyring? "
 msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "� una chiave segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "enumerate keyblocks fallito: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "c'� una chiave segreta per questa chiave pubblica!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
 
@@ -3745,7 +3831,14 @@ msgstr ""
 "non\n"
 "� valida per qualche ragione e ne � disponibile un'altra."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3753,19 +3846,19 @@ msgstr ""
 "Inserisci la passphrase, cio� una frase segreta.\n"
 "  bla, bla, bla..."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Ripeti l'ultima passphrase per essere sicuro di cosa hai scritto."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Inserisci il nome del file a cui si riferisce la firma."
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Rispondi \"si\" se va bene sovrascrivere il file."
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3773,7 +3866,7 @@ msgstr ""
 "Inserisci il nuovo nome del file. Se premi INVIO sar� usato il nome\n"
 "predefinito (quello indicato tra parentesi)."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3802,7 +3895,7 @@ msgstr ""
 "      Usa questo per affermare che l'user ID non dovrebbe pi� essere usato;\n"
 "      solitamente � usato per indicare un indirizzo di email non valido.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3812,11 +3905,79 @@ msgstr ""
 "questo certificato di revoca. Per favore sii conciso.\n"
 "Una riga vuota termina il testo.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Non � disponibile un aiuto"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
+
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "errore scrivendo il portachiavi `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: portachiavi creato\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: portachiavi creato\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s � quello non modificato\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s � quello nuovo\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "sono stati richiesti troppi bit casuali; il limite � %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Per informazioni si veda http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (firma e cifra)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: utente non trovato: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "problema di lettura del certificato: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utente non trovato\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: impossibile creare il portachiavi: %s\n"
diff --git a/po/ja.po b/po/ja.po
index fa824d3d1..4ec807630 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -15,39 +15,39 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "�ٹ�: ��Ф����꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -258,17 +258,17 @@ msgstr "�������������Ǥ�"
 msgid "unusable secret key"
 msgstr "��̩���������Ǥ�"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'�������ޤ���: %s\n"
@@ -315,16 +315,11 @@ msgstr "`%s'�˽񤱤ޤ���: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "`%s'���Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "�����ࡦ�ӥåȤ򤿤������׵ᤷ�᤮�Ǥ����³��� %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +344,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -357,141 +352,141 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[̾��]|���ѥǡ����١���������å�"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,193 +496,200 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr ""
+"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
+"�񤭽Ф�"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -696,7 +698,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -716,15 +718,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -734,7 +736,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -742,191 +744,201 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "ͥ���̤ΰ���"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [�ե�����̾]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key �桼����id"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key �桼����id"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -934,11 +946,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -971,7 +983,7 @@ msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 msgid "unexpected armor:"
 msgstr "ͽ����������:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
@@ -988,7 +1000,7 @@ msgstr "�ե������������᤹���ޤ� (CRC����ˤ���ޤ�)\n"
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC���顼��%06lx - %06lx\n"
@@ -1001,20 +1013,16 @@ msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1023,7 +1031,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                    ����:"
 
@@ -1206,59 +1214,59 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "�ٹ�: ���ѤǤ��ʤ������Ѥ��Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "�ٹ�: �����������ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1266,109 +1274,130 @@ msgstr ""
 "�桼����ID�����ꤵ��Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "�桼����ID������: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "�����å�: �������ϴ��� --encrypt-to ������ѤߤǤ�\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ���θ��ڥ��顼: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��Ѷػ�\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "`%s'�򥹥��å�: duplicated\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "ͥ���̤ΰ���"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "̾����̵����ʸ��������ޤ�\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA��ElGamal (����)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (��̾�Τ�)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
-#: g10/keygen.c:572
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? "
-
-#: g10/keygen.c:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1381,19 +1410,19 @@ msgstr ""
 "             ����θ�Ĺ�� 1024 �ӥå�\n"
 "         ����ο侩��Ĺ�� 2048 �ӥå�\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 
@@ -1405,12 +1434,12 @@ msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\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:633
+#: g10/keygen.c:837
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1418,11 +1447,11 @@ msgstr ""
 "2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1430,21 +1459,21 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
 "����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "����ʤ�Ĺ�����������ˤ���ޤ���? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1460,25 +1489,25 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "����̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "����%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1486,11 +1515,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "����Ǥ����Ǥ��� (y/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1506,44 +1535,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1554,27 +1583,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1582,11 +1611,11 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1598,7 +1627,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1609,29 +1638,49 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'����̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "����`%s'�ν���ߥ��顼: %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "����`%s'�ν���ߥ��顼: %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1639,43 +1688,43 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: �����ޤ���: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
@@ -1685,55 +1734,55 @@ msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 msgid "reading from `%s'\n"
 msgstr "`%s'�����ɤ߹��ߤޤ�\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s�Ź沽 ������: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: �桼���������Ĥ���ޤ���: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "�桼����'%s'�����Ĥ���ޤ���: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "��������ɹ��߾㳲: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
 
-#: g10/export.c:182
+#: g10/export.c:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
@@ -1743,7 +1792,7 @@ msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
 msgid "skipping block of type %d\n"
 msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu���ޤǽ���\n"
@@ -1813,50 +1862,46 @@ msgstr "       ��̩�����ɹ���: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "����θ������ؤ�����ޤ���\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'�ؤν�Ф�\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "����`%s'����å��Ǥ��ޤ���: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
@@ -1866,123 +1911,128 @@ msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
 
-#: g10/import.c:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "��%08lX: �������桼����ID��1��\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "��%08lX: �������桼����ID��%d��\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "��%08lX: ��������̾��1��\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "��%08lX: ��������̾��%d��\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "��%08lX: ������������1��\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "��%08lX: ������������%d��\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "��%08lX: �ѹ��ʤ�\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "����θ������ؤ�����ޤ���\n"
+
+#: g10/import.c:652
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "��%08lX: ̵���ʼ��ʽ�̾�Ǥ�\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
@@ -1991,104 +2041,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:919
+#: g10/import.c:939
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:928
+#: g10/import.c:948
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "��%08lX: �˴���������ɲ�\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n"
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: �桼���������Ĥ���ޤ���\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[�˴�]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2096,33 +2141,33 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2130,7 +2175,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2139,425 +2184,471 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "ͥ���̤ΰ���"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "ͥ���̤ΰ���"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "`%s'���ɹ��ߥ��顼: %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤������������˴����ޤ���? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "���θ����������˴����ޤ���? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "�˴�������������˺��ޤ���? (y/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �������˴��ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- �Ǥä��������˴���ȯ��\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �˴���ǧ�㳲: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2566,153 +2657,172 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s�Ź沽���줿�ǡ���\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "��������%08lX�Ǥ�\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s�Ź沽���줿�ǡ���\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "ʬΥ��̾�����"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�����"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -2737,7 +2847,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -2750,12 +2860,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
@@ -2799,7 +2909,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2809,20 +2919,20 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -2832,52 +2942,57 @@ msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ץ��ץ�������Ѥ��Ƥ�������\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "`%s'���ɹ��ߥ��顼: %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɹ����� ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ��� �������ޤ���\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ������ѤǤ���\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "�ݸ�르�ꥺ��%d��̤�Τ������ԲĤǤ�\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
@@ -2892,26 +3007,26 @@ msgstr "��%08lX��%s���׵� ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С��Ϥ���ޤ��� (--keyserver���ץ�����Ȥ��ޤ��礦)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ��������ID�Ǥ���ޤ���\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s'�ؤ��������顼: %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "`%s'�ؤ����������� (����=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
@@ -2933,59 +3048,64 @@ msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ������� ...\n"
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ�������MDC�Ȥߤʤ��ޤ�\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:307
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:308
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "����: %08lX ��̾�θ��ϴ����ڤ�Ǥ�%s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s���Ǥ��ޤ���: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "����˼��Ԥ��ޤ���: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2997,12 +3117,12 @@ msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϻ��ѤǤ��ޤ���\n"
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
@@ -3011,113 +3131,118 @@ msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ���������Ǥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ���񤬤���ޤ���!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: �����Ǥ��ޤ���: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ���å����Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: ���å����Ǥ��ޤ���\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: �����Ǥ��ޤ���: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ̵���ʥե����롦�С������%d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
@@ -3168,8 +3293,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record �˼��Ԥ��ޤ���: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' ���������緿��ID�Ǥ���ޤ���\n"
 
 #: g10/trustdb.c:501
@@ -3202,213 +3327,209 @@ msgstr "�� %08lX: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "����: ��̩��%08lX���ݸ��Ƥ��� ����\n"
 
-#: g10/trustdb.c:584
+#: g10/trustdb.c:585
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "��%08lX: ��̩���ȸ��������б����Ƥ��ޤ���\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "��̩�������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "��%08lX.%lu: �������б���ͭ���Ǥ�\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "��%08lX.%lu: �������б���̵���Ǥ�: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "��%08lX.%lu: ͭ���ʸ����˴�\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "��%08lX.%lu: ̵���ʸ����˴�: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "��%08lX.%lu: ͭ�����������˴�\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "ͭ���ʼ��ʽ�̾"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "̵���ʼ��ʽ�̾"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "���������ʽ�̾����Ƥ���Τǡ�ͭ���ʥ桼����ID���˴��ϹԤ��ޤ���"
 
-#: g10/trustdb.c:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "ͭ���ʥ桼����ID���˴�"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "̵���ʥ桼����ID���˴�"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "ͭ���ʾ�������˴�"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "ͭ���ʾ�����"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "̵���ʾ�������˴�"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "̵���ʾ�����"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "��̾�쥳����%lu[%d] �ϸ��ä��쥳���ɤ�ؤ��Ƥ��ޤ���\n"
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "��ʣ���������� - ���"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: �����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: �����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: �������ޤ���\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "�ǥ��쥯�ȥ꡼���쥳���ɤ��ɽФ����顼: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu����������ޤ���\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu���ˤϥ��顼������ޤ�\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu�����������ޤ���\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "���֥��å��ΰ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: ���ʤ��Υǥ��쥯�ȥ꡼���쥳���� - �����å�\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu������������\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu���򥹥��åפ��ޤ���\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu���򹹿����ޤ���\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "���äȡ���������ޤ���\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "���äȡ��桼����ID������ޤ���\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: �ǥ��쥯�ȥ꡼���쥳���ɤθ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "��%08lX: ���ѥ쥳���ɤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "��%08lX.%lu: ���ѥ쥳���ɤ��������ޤ���\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "��%08lX.%lu: ̤��ˤǤ��Ƥ��ޤ� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/trustdb.c:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "��%08lX.%lu: %s�Ǵ����ڤ�Ǥ�\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "��%08lX.%lu: ���Ѥθ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "�桼����'%s'�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "���ѥǡ����١�������'%s'�θ����˾㳲: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "�桼����'%s'�Ͽ��ѥǡ����١�������Ͽ����Ƥ��ޤ��� - ����\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "'%s'�ο��ѥǡ����١����ؤ���Ͽ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3424,34 +3545,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: ���ؤ��Ǥ��ޤ���: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s���ѹ��Τʤ����Ǥ�\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s�Ͽ��������Ǥ�\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "���ΰ�����η�٤������Ƥ�������\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3529,22 +3622,12 @@ msgstr "%s: ���񤬤Ǥ��ޤ���\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s�Ź沽���줿�ǡ���\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr ""
@@ -3560,23 +3643,28 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "���θ����ؤ��������ޤ���? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "���֥��å��ΰ����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "���θ������ˤ���������̩��������ޤ�!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n"
 
@@ -3759,7 +3847,14 @@ msgstr ""
 "����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��̵���Ǥ��äơ�\n"
 "���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3767,19 +3862,19 @@ msgstr ""
 "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ���\n"
 "  ���������������������줳��� "
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "��񤭤��Ƥ褱��С���yes�פ������Ƥ�������"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3787,7 +3882,7 @@ msgstr ""
 "�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
 "(��̤ǰϤ��) ����Υե�����̾����Ѥ��ޤ���"
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3816,7 +3911,7 @@ msgstr ""
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3826,15 +3921,83 @@ msgstr ""
 "�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "�إ�פϤ���ޤ���"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s'�Υإ�פϤ���ޤ���"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "����`%s'�ν���ߥ��顼: %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s���ѹ��Τʤ����Ǥ�\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s�Ͽ��������Ǥ�\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "���ΰ�����η�٤������Ƥ�������\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "�����ࡦ�ӥåȤ򤿤������׵ᤷ�᤮�Ǥ����³��� %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: �桼���������Ĥ���ޤ���: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "��������ɹ��߾㳲: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "����`%s'����å��Ǥ��ޤ���: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: �桼���������Ĥ���ޤ���\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: ���ؤ��Ǥ��ޤ���: %s\n"
+
 #~ msgid "invalid"
 #~ msgstr "̵��"
 
diff --git a/po/nl.po b/po/nl.po
index 8dab1eb7a..5815658b8 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: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -13,39 +13,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "yYjJ"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "einde"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQeE"
 
@@ -256,17 +256,17 @@ msgstr "foutieve publieke sleutel"
 msgid "unusable secret key"
 msgstr "foutieve geheime sleutel"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -313,16 +313,11 @@ msgstr "kan `%s' niet openen: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -348,7 +343,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +351,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,163 +493,168 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
+
+#: g10/g10.c:332
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,17 +674,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
 "fouten in de vertaling aan <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -694,7 +694,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -702,193 +702,203 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "toon voorkeuren"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [bestandsnaam]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key gebruikersidentificatie"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "het eerste teken van een notitienaam moet een letter of laag liggend steepje "
 "zijn\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -896,11 +906,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -933,7 +943,7 @@ msgstr "ongeldige regel met streepjes: "
 msgid "unexpected armor:"
 msgstr "onverwachte beveiliging:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ongeldig wortel64 teken %02x overgeslagen\n"
@@ -950,7 +960,7 @@ msgstr "voortijdig einde (in controlesom)\n"
 msgid "malformed CRC\n"
 msgstr "verkeerde controlesom\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "fout in controlesom; %06lx - %06lx\n"
@@ -965,20 +975,16 @@ msgstr "voortijdig einde (in trailer)\n"
 msgid "error in trailer line\n"
 msgstr "fout in de trailer regel\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr ""
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ongeldige beveiliging: regel langer dan %d tekens\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -987,7 +993,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
@@ -1173,66 +1179,66 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "LET OP: Ik gebruik een onbetrouwbare sleutel!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr ""
 "         Dit zou kunnen betekenen dat de ondertekening een vervalsing is.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "LET OP: Deze subsleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "LET OP: Deze sleutel is niet getekend met een betrouwbare ondertekening!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Er is geen indicatie dat deze ondertekening van de eigenaar is.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "LET OP: We vertrouwen NIET op deze sleutel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         De sleutel is waarschijnlijk VERVALST.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "LET OP: Deze sleutel is niet getekend met genoeg betrouwbare "
 "ondertekeningen!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1240,112 +1246,133 @@ msgstr ""
 "Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Geef de gebruikersidentificatie: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
 
 # fixme
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "`%s' overgeslagen: dubbel\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "toon voorkeuren"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Ongeldig teken in naam\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "zelfondertekening wegschrijven\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:756
 #, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (alleen ondertekenen)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1358,19 +1385,19 @@ msgstr ""
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1383,12 +1410,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:633
+#: g10/keygen.c:837
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1396,11 +1423,11 @@ msgstr ""
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1408,21 +1435,21 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1438,26 +1465,26 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1465,11 +1492,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1485,44 +1512,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1533,28 +1560,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 #, 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1562,11 +1589,11 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1578,7 +1605,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1591,29 +1618,49 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1622,12 +1669,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1635,7 +1682,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1643,26 +1690,26 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kon niet openen: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
@@ -1672,56 +1719,56 @@ msgstr "%s: LET OP: leeg bestand\n"
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: gebruiker niet gevonden: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "leesprobleem voor certificaat: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets ge�xporteerd\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[gebruiker niet gevonden]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
@@ -1732,7 +1779,7 @@ msgstr ""
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
@@ -1802,51 +1849,47 @@ msgstr "geheime sleutels ge�mporteerd: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "geen standaard openbare sleutelbos\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
@@ -1856,126 +1899,131 @@ msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "geen standaard openbare sleutelbos\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1984,86 +2032,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: gebruiker niet gevonden\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2071,17 +2114,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2089,7 +2132,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2097,34 +2140,34 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2132,7 +2175,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2140,426 +2183,472 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "toon voorkeuren"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "toon voorkeuren"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "fout bij lezen `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Al deze gebruikers echt verwijderen? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 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:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 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:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2568,154 +2657,173 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 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:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s versleutelde gegevens\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "versleuteld met onbekend algoritme %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s versleutelde gegevens\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -2738,7 +2846,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:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -2751,12 +2859,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutelnummer %08lX)"
@@ -2800,7 +2908,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2810,20 +2918,20 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
@@ -2832,52 +2940,57 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "fout bij lezen `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Losstaande ondertekening.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Geef de naam van het gegevensbestand: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "lezen uit standaard invoer ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "geen ondertekende gegevens\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okee, wij zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "oude codering van de DEK wordt niet ondersteund.\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: geheime sleutel %08lX is vervallen op %s\n"
@@ -2892,26 +3005,26 @@ msgstr "opvragen van sleutel %08lX van %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij versturen naar `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "versturen naar `%s' gelukt (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
@@ -2936,59 +3049,64 @@ msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
 "opnieuw.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "foutieve MDC aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening %08lX is vervallen op %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "LET OP: `%s' is een leeg bestand\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "LET OP: `%s' is een leeg bestand\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "ontsleuteling mislukte: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3001,12 +3119,12 @@ msgid "input line longer than %d characters\n"
 msgstr "invoerregel langer dan %d tekens\n"
 
 # Untranslated.
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseed failed: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
@@ -3015,114 +3133,119 @@ msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transactie naar vertrouwensdatabase te groot\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: kan er niet bij: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: kan hem niet aanmaken: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: kan hem niet vergrendelen\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: kan hem niet vergrendelen\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: kan hem niet aanmaken: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: aanmaken van versieveld lukte niet: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: foutieve vertrouwensdatabase aangemaakt\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: vertrouwensdatabase aangemaakt\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ongeldige vertrouwensdatabase\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: kon frommeltabel niet aanmaken: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fout bij het bijwerken van versieveld: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fout bij het lezen van het versieveld: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fout bij het schrijven van het versieveld: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "vertrouwensdatabase: lseek mislukte: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "vertrouwensdatabase: lezen mislukte (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: is geen vertrouwensdatabasebestand\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versieveld met recnr %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ongeldige bestandsversie %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fout bij het lezen van een beschikbaar veld: %s\n"
 
 # dir?
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fout bij het schrijven van indexveld: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: veld met nullen vullen lukte niet: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kon geen veld toevoegen: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "de vertrouwensdatabase is beschadigd; draai a.u.b. \"gpg --fix-trustdb\".\n"
@@ -3174,7 +3297,7 @@ msgstr "get_dir_record: search_record mislukte: %s\n"
 
 #: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "'%s' is not a valid long keyID\n"
+msgid "`%s' is not a valid long keyID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
 #: g10/trustdb.c:501
@@ -3207,218 +3330,214 @@ msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "LET OP: geheime sleutel %08lX is NIET beveiligd.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "sleutel %08lX.%lu: Foutieve subsleutelbinding: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige sleutelterugtrekking\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "sleutel %08lX.%lu: Ongeldige sleutelterugtrekking: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Correcte zelfondertekening"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Ongeldige zelfondertekening"
 
 # User ID onvertaald
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Geldig terugtrekkingscertificaat overgeslagen wegens een nieuwere "
 "zelfondertekening"
 
-#: g10/trustdb.c:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Geldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Ongeldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Geldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Correct certificaat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Ongeldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Ongeldig certificaat"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "dubbel certificaat - verwijderd"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir mislukte: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ingevoegd\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fout bij het lezen van indexveld: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "        %lu sleutels met fouten\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "        %lu sleutels ingevoegd\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: indexveld zonder sleutel - overgeslagen\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "        %lu vanwege nieuwe openbare sleutels\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "        %lu sleutels overgeslagen\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "        %lu sleutels bijgewerkt\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooeeps, geen sleutels\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooeeps, geen gebruikersidentificaties\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: zoeken naar indexveld mislukte: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "sleutel %08lX: invoegen van vertrouwensveld mislukte: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "sleutel %08lX.%lu: ingevoegd in de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "sleutel %08lX.%lu: vervallen op %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "sleutel %08lX.%lu: betrouwbaarheidscontrole mislukt: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "kon `%s' niet opzoeken in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "gebruiker '%s' komt niet voor in de vertrouwensdatabase - invoegen\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3434,34 +3553,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: sleutelbos aangemaakt\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s is de onveranderde\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s is de nieuwe\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Dicht dit mogelijke beveiligingsgat\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3540,24 +3631,14 @@ 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"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s versleutelde gegevens\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "versleuteld met onbekend algoritme %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "LET OP: dit bericht werd versleuteld met een zwakke sleutel in het\n"
 "symmetrische versleutelalgoritme.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
@@ -3573,23 +3654,28 @@ 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:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Deze sleutel van de sleutelbos verwijderen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "nummeren van de sleutelblokken mislukte: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
@@ -3782,7 +3868,14 @@ msgstr ""
 "hierna te gebruiken. Dus doe dit alleen als de zelfondertekening om de\n"
 "een of andere reden niet geldig is, en een tweede beschikbaar is."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3790,21 +3883,21 @@ msgstr ""
 "Geef a.u.b. een sleuteltekst; dit is een geheime zin\n"
 "  blabla, blablabla, ..."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Herhaal a.u.b. de voorgaande sleuteltekst, zodat u zeker weet wat u ingetypt "
 "heeft."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Geef de naam van het bestand waaraan de ondertekening toebehoort"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Antwoord \"ja\" als het goed is om het bestand te overschrijven"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3812,7 +3905,7 @@ msgstr ""
 "Geef a.u.b. een nieuwe bestansnaam. Als u op RETURN drukt, wordt de\n"
 "standaard bestandsnaam (tussen blokhaken weergegeven) gebruikt."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3828,22 +3921,86 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Geen hulp beschikbaar"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: sleutelbos aangemaakt\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: sleutelbos aangemaakt\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s is de onveranderde\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s is de nieuwe\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Dicht dit mogelijke beveiligingsgat\n"
+
+#, fuzzy
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
+
+#~ 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? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: gebruiker niet gevonden: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "leesprobleem voor certificaat: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: gebruiker niet gevonden\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
+
 #, fuzzy
 #~ msgid "invalid"
 #~ msgstr "ongeldige versleuteling"
diff --git a/po/pl.po b/po/pl.po
index 86cc45b82..de9339236 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-21 01:03+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -23,39 +23,39 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze�enie: u�ywana pami�� nie jest pami�ci� bezpieczn�!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "wyj�cie"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "wW"
 
@@ -264,17 +264,17 @@ msgstr "bezu�yteczny klucz publiczny"
 msgid "unusable secret key"
 msgstr "bezu�yteczny klucz tajny"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
@@ -322,18 +322,13 @@ msgstr "nie mo�na zapisa� %s: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� %s: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "��danie zbyt wielu losowych bit�w; ograniczenie wynosi %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 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:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -359,7 +354,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -367,139 +362,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -509,157 +504,162 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "u�yj gpg-agenta"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|zapisa� opis stanu do FD"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 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/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -667,7 +667,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -688,15 +688,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -706,7 +706,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -714,190 +714,200 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "lista opcji"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [plik]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key key nazwa u�ytkownika"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -905,11 +915,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -942,7 +952,7 @@ msgstr "niepoprawne oznaczenie linii minusami: "
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
@@ -959,7 +969,7 @@ msgstr "przedwczesny koniec pliku (w CRC)\n"
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
@@ -972,20 +982,16 @@ msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Dalsze informacje znajduj� si� na http://www.gnupg.org/"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -994,7 +1000,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
@@ -1179,63 +1185,63 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nic nie wskazuje na to �e ten podpis z�o�y� w�a�ciciel klucza.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�c zaufanyne podpisy!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez "
 "w�a�ciciela.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: klucz publiczny ju� znajduje si� w bazie\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1243,109 +1249,130 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z uzycia.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pomini�ty: klucz publiczny ju� wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy�lny adresat '%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, 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:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "pomini�ty '%s': duplikat\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "Zbyt wiele ustawie�."
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, 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:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "U�ywanie tego algorytmu jest odradzane - tworzy� mimo to? "
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1358,19 +1385,19 @@ msgstr ""
 "               domy�lny rozmiar klucza wynosi 1024 bity\n"
 "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 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:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
@@ -1383,12 +1410,12 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1396,11 +1423,11 @@ msgstr ""
 "Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� obliczenia\n"
 "trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1408,21 +1435,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1438,25 +1465,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:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1464,11 +1491,11 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1484,44 +1511,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 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:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1532,47 +1559,47 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "czy (W)yj��? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 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:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 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:970
+#: g10/keygen.c:1176
 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"
@@ -1584,7 +1611,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1598,29 +1625,49 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
 "entropii.\n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 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:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "klucz %08lX: brak klucza publicznego: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "tajny i publiczny klucz zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1628,12 +1675,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1641,7 +1688,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1649,26 +1696,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Na pewno utworzy�? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo�na otworzy�: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
@@ -1678,55 +1725,55 @@ msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: nie znaleziono u�ytkownika %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "b��d przy odczycie certyfikatu: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1736,7 +1783,7 @@ msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
@@ -1806,50 +1853,46 @@ msgstr "     tajnych kluczy dodanych: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "brak domy�lnego zbioru kluczy publicznych\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "niemo�liwy jest zapis zbioru kluczy: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
@@ -1859,126 +1902,131 @@ msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr "klucz tajny %08lX nie zosta� wczytany (aby to zrobi� u�yj %s)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, 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:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1987,83 +2035,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, 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:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: nie znaleziono u�ytkownika\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 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:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, 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:233
+#: g10/keyedit.c:211
 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:235
+#: g10/keyedit.c:213
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2071,17 +2114,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2089,7 +2132,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2097,33 +2140,33 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2131,7 +2174,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2139,425 +2182,471 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "opcje"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "lista opcji"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "opcje"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "lista opcji"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "b��d odczytu '%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  utworzony: %s wygasa %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr "zaufanie: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2566,154 +2655,173 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "podpisany przez %08lX w %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr "[wygasa :%s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s zaszyfrowane dane\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "zaszyfrowane nieznanym algorytmem %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s zaszyfrowane dane\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj \"gpg --import\" aby go przyj��\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Adnotacja:"
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Regulamin:"
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis z�o�ony %.*s za pomoc� %s,\n"
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2737,7 +2845,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2750,12 +2858,12 @@ msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej GPG_AGENT_INFO\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na po��czy� si� z %s: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (g��wny ID klucza %08lX)"
@@ -2796,7 +2904,7 @@ msgstr "anulowane przez u�ytkownika\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2806,20 +2914,20 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
@@ -2828,51 +2936,56 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "b��d odczytu '%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; pr�buj� klucz tajny %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d jest nieznany, b�d� zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
@@ -2887,26 +3000,26 @@ msgstr "zapytanie o klucz %08lX w %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "nie mo�na pobra� klucza z serwera: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do '%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "wysy�anie do '%s' powiod�o si� (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
@@ -2931,61 +3044,66 @@ msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
 "             wyra�enie przej�ciowe (has�o).\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niepoprawno�� MDC z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy %08lX przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "b��d odszyfrowywania: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2997,12 +3115,12 @@ msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -3011,113 +3129,118 @@ msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: dost�p niemo�liwy: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: nie mo�na utworzy�: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: nie mo�na utworzy� blokady\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: nie mo�na utworzy� blokady\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: nie mo�na utworzy�: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: procedura lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpg --fix-trustdb\".\n"
@@ -3168,8 +3291,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, 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:501
@@ -3203,217 +3326,213 @@ msgstr ""
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi�zanie podklucza\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi�zanie podklucza %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie klucza\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa�nienie podklucza\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Poprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Poprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne uniewa�nienie certyfikatu"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "podw�jny certyfikat - usuni�ty"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiod�a si�: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "b��d podczas odczytu wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z b��dami\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie blok�w kluczy nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "        %lu z powodu nowych podkluczy\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pomini�tych\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikator�w u�ytkownik�w\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, 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:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, 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:2430
+#: g10/trustdb.c:2373
 #, 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:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3429,34 +3548,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: zbi�r kluczy utworzony\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s pozosta� bez zmian\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s zosta� utworzony\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3533,23 +3624,13 @@ msgstr "%s: katalog utworzony\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "aby u�y� nowego pliku ustawie�, nale�y od nowa uruchomi� GnuPG\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s zaszyfrowane dane\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "zaszyfrowane nieznanym algorytmem %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana s�abym kluczem szyfru symetrycznego.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "problem podczas obr�bki pakietu szyfrowego\n"
 
@@ -3564,23 +3645,28 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Usun�� ten klucz ze zbioru? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "wyliczenie blok�w kluczy nie powiod�o si�: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "jest klucz tajny do tego klucza publicznego!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
@@ -3773,7 +3859,14 @@ msgstr ""
 "klucza nim samym z jakich� przyczyn nie jest poprawny, i klucz jest\n"
 "drugi raz podpisany w ten sam spos�b."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3781,27 +3874,27 @@ msgstr ""
 "Podaj wyra�enie przej�ciowe (d�ugie, skomplikowane has�o)\n"
 "  Bla, bla, bla...."
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Prosz� powr�trzy� wyra�enie przej�ciowe, aby upewni� si� �e nie by�o pomy�ki."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Je�li mo�na nadpisa� ten plik, nale�y napisa� \"tak\""
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
 "Nazwa pliku. Naci�ni�cie ENTER potwierdzi nazw� domy�ln� (w nawiasach)."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3828,7 +3921,7 @@ msgstr ""
 "      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
 "      poprawny.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3838,15 +3931,86 @@ msgstr ""
 "uniewa�nienia. Opis powinien byc zwi�z�y. \n"
 "Pusta linia ko�czy wprowadzanie tekstu.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: zbi�r kluczy utworzony\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: zbi�r kluczy utworzony\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s pozosta� bez zmian\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s zosta� utworzony\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "��danie zbyt wielu losowych bit�w; ograniczenie wynosi %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Dalsze informacje znajduj� si� na http://www.gnupg.org/"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Czy na pewno chcesz stworzy� klucz do szyfrowania i podpisywania? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: nie znaleziono u�ytkownika %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "b��d przy odczycie certyfikatu: %s\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 "%s: user not found\n"
+#~ msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
+
 #~ msgid "RSA key cannot be used in this version\n"
 #~ msgstr "W tej wersji nie mo�na u�ywa� kluczy RSA\n"
 
@@ -3945,9 +4109,6 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: pobranie bloku klucza niemo�liwe: %s\n"
 
-#~ msgid "Too many preferences"
-#~ msgstr "Zbyt wiele ustawie�."
-
 #~ msgid "Too many preference items"
 #~ msgstr "Zbyt wiele pozycji w ustawieniach"
 
@@ -4131,12 +4292,6 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "can't write keyblock: %s\n"
 #~ msgstr "nie mog� zapisa� bloku klucza: %s\n"
 
-#~ msgid "can't lock secret keyring: %s\n"
-#~ msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
-
-#~ msgid "can't write keyring: %s\n"
-#~ msgstr "niemo�liwy jest zapis zbioru kluczy: %s\n"
-
 #~ msgid "encrypted message is valid\n"
 #~ msgstr "zaszyfrowana wiadomo�� jest poprawna\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 11fcadefe..8f69973f8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/"
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -262,17 +262,17 @@ msgstr "chave p�blica incorreta"
 msgid "unusable secret key"
 msgstr "chave secreta incorreta"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -319,16 +319,11 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -354,7 +349,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -362,144 +357,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -509,179 +504,186 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr ""
+"|DA|escrever informa��es de estado para o\n"
+"descritor de arquivo DA"
+
+#: g10/g10.c:332
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -701,15 +703,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -719,7 +721,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -727,194 +729,204 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "lista prefer�ncias"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nome_do_arquivo]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key id-usu�rio"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -922,12 +934,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 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"
 
@@ -960,7 +972,7 @@ msgstr "linha com h�fen inv�lida: "
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
@@ -977,7 +989,7 @@ msgstr "fim de arquivo prematuro (no CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
@@ -990,20 +1002,16 @@ msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr ""
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1012,7 +1020,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1197,61 +1205,61 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1259,110 +1267,132 @@ msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave p�blica j� marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "ignorado `%s': duplicado\n"
+
+# muitas ou demais ???
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "Prefer�ncias demais"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Caractere inv�lido no nome\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:756
 #, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1375,19 +1405,19 @@ msgstr ""
 "              tamanho padr�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
@@ -1400,12 +1430,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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1413,11 +1443,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:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1425,21 +1455,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Voc� realmente precisa de uma chave t�o grande? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1455,25 +1485,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1481,11 +1511,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:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1501,44 +1531,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 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:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1549,28 +1579,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 #, 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1578,11 +1608,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1594,7 +1624,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1606,29 +1636,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1636,12 +1686,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1649,7 +1699,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1657,26 +1707,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
@@ -1686,56 +1736,56 @@ msgstr "%s: AVISO: arquivo vazio\n"
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: usu�rio n�o encontrado: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "usu�rio `%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1745,7 +1795,7 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
@@ -1815,50 +1865,46 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, 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:440
+#: g10/import.c:439
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "sem chaveiro p�blico padr�o\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
@@ -1868,125 +1914,130 @@ msgstr "chave %08lX: chave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, 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:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, 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:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, 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:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, 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:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1995,98 +2046,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, 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:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: usu�rio n�o encontrado\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 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:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 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:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2094,7 +2140,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2102,34 +2148,34 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2137,7 +2183,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2145,427 +2191,473 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 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:827
+#: g10/keyedit.c:829
 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:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
+
 # help ou ajuda ???
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2574,153 +2666,172 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dados criptografados com %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "criptografado com algoritmo desconhecido %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "dados criptografados com %s\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2745,7 +2856,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:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2758,12 +2869,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2808,7 +2919,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2818,20 +2929,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2839,52 +2950,57 @@ msgstr "Repita a frase secreta: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, 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:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -2899,26 +3015,26 @@ msgstr ""
 msgid "can't get key from keyserver: %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2942,58 +3058,63 @@ 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorreto devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lX expirou %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "AVISO: `%s' � um arquivo vazio\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "descriptografia falhou: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3005,12 +3126,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
@@ -3019,113 +3140,118 @@ msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel acessar: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: imposs�vel criar: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar trava\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: imposs�vel criar trava\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: imposs�vel criar: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
@@ -3178,7 +3304,7 @@ msgstr "get_dir_record: search_record falhou: %s\n"
 
 #: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "'%s' is not a valid long keyID\n"
+msgid "`%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
 #: g10/trustdb.c:501
@@ -3212,216 +3338,212 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave v�lida\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Auto-assinatura v�lida"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inv�lida"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Revoga��o de ID de usu�rio v�lida"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Revoga��o de ID de usu�rio inv�lida"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Certificado de revoga��o v�lido"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revoga��o inv�lido"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Certificado inv�lido"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro lendo registro de diret�rio: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves p�blicas\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usu�rio\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, 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:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, 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:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, 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:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, 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:2586
+#: g10/trustdb.c:2529
 #, 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:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3437,34 +3559,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: imposs�vel criar chaveiro: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: chaveiro criado\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s � o n�o modificado\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s � o novo\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3544,24 +3638,14 @@ msgstr ""
 "voc� deve reiniciar o GnuPG, para que ele possa ler o novo arquivo\n"
 "de op��es\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dados criptografados com %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "criptografado com algoritmo desconhecido %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "eliminar o campo keyid dos pacotes criptografados\n"
@@ -3577,23 +3661,28 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Deletar esta chave do chaveiro? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
@@ -3780,27 +3869,34 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr ""
 "Por favor repita a �ltima frase secreta, para ter certeza do que voc� "
 "digitou."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o arquivo ao qual a assinatura se aplica"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser sobrescrever o arquivo"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3808,7 +3904,7 @@ msgstr ""
 "Por favor digite um novo nome de arquivo. Se voc� apenas apertar RETURN o\n"
 "arquivo padr�o (que � mostrado em colchetes) ser� usado."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3824,22 +3920,90 @@ msgid ""
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "erro na escrita do chaveiro `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: chaveiro criado\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: chaveiro criado\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s � o n�o modificado\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s � o novo\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
+
+#, fuzzy
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr ""
+#~ "Voc� realmente quer criar uma chave para assinatura e criptografia? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: usu�rio n�o encontrado: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "erro de leitura do certificado: %s\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 "%s: user not found\n"
+#~ msgstr "%s: usu�rio n�o encontrado\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr ""
+#~ "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: imposs�vel criar chaveiro: %s\n"
+
 #, fuzzy
 #~ msgid "invalid"
 #~ msgstr "armadura inv�lida"
@@ -3936,10 +4100,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
 #~ msgid "lid %lu: can't get keyblock: %s\n"
 #~ msgstr "lid %lu: imposs�vel pegar bloco de chaves: %s\n"
 
-# muitas ou demais ???
-#~ msgid "Too many preferences"
-#~ msgstr "Prefer�ncias demais"
-
 #~ msgid "Too many preference items"
 #~ msgstr "Muitos itens de prefer�ncia"
 
@@ -3997,12 +4157,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
 #~ msgid "can't write keyblock: %s\n"
 #~ msgstr "imposs�vel escrever bloco de chaves: %s\n"
 
-#~ msgid "can't lock secret keyring: %s\n"
-#~ msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
-
-#~ msgid "can't write keyring: %s\n"
-#~ msgstr "imposs�vel escrever chaveiro: %s\n"
-
 #, fuzzy
 #~ msgid "encrypted message is valid\n"
 #~ msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 995f54fc3..c7fc81095 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-04-08 16:28+00:00\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -16,39 +16,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "n�o"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "qQ"
 
@@ -257,17 +257,17 @@ msgstr "chave p�blica n�o utiliz�vel"
 msgid "unusable secret key"
 msgstr "chave secreta n�o utiliz�vel"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto � um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -315,16 +315,11 @@ msgstr "imposs�vel escrever `%s': %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "demasiados bits alet�rios pedidos; o limite s�o %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -349,7 +344,7 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +352,139 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,174 +494,181 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr ""
+"|DF|escrever informa��es de estado para o\n"
+"descritor de ficheiro DF"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -674,7 +676,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -694,15 +696,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -712,7 +714,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -720,192 +722,202 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "lista prefer�ncias"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [nome_do_ficheiro]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key id-utilizador"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -913,12 +925,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 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"
 
@@ -951,7 +963,7 @@ msgstr "linha com h�fen inv�lida: "
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
@@ -968,7 +980,7 @@ msgstr "fim de ficheiro prematuro (no CRC)\n"
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
@@ -981,20 +993,16 @@ msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Para mais informa��es veja http://www.gnupg.org"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1003,7 +1011,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1187,61 +1195,61 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Utilizando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1249,109 +1257,130 @@ msgstr ""
 "Voc� n�o especificou um identificador de utilizador. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de utilizador: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 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:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "ignorado `%s': duplicada\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "lista prefer�ncias"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Caracter inv�lido no nome\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e cifragem)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (assinatura e cifragem)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (apenas assinatura)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "A utiliza��o destes algoritmos est� desactualizada - criar na mesma?"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1364,19 +1393,19 @@ msgstr ""
 "         tamanho por omiss�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
 
@@ -1388,12 +1417,12 @@ msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para 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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1401,11 +1430,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:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1413,21 +1442,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Voc� precisa realmente de uma chave t�o grande? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1443,25 +1472,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1469,11 +1498,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:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1490,44 +1519,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 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:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1538,29 +1567,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
 "coment�rio\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1568,11 +1597,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1584,7 +1613,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1596,29 +1625,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1626,12 +1675,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1639,7 +1688,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1647,26 +1696,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
@@ -1676,55 +1725,55 @@ msgstr "%s: AVISO: ficheiro vazio\n"
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: utilizador n�o encontrado: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "utilizador `%s' 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/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1734,7 +1783,7 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
@@ -1804,50 +1853,46 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, 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:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "sem porta-chaves p�blico padr�o\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
@@ -1857,125 +1902,130 @@ msgstr "chave %08lX: chave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr "chave secreta %08lX n�o foi importada (utilize %s para o permitir)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "sem porta-chaves p�blico padr�o\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, 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:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, 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:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, 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:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1984,98 +2034,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, 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:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: utilizador n�o encontrado\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 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:227
+#: g10/keyedit.c:205
 #, 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:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 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:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2083,7 +2128,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2091,33 +2136,33 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2125,7 +2170,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2133,425 +2178,471 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 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:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "lista prefer�ncias"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, 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:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 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:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, 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:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��o falsa encontrada\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 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:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2560,151 +2651,170 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr "[expira: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dados encriptados com %s\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encriptado com algoritmo desconhecido %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencripta��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "dados encriptados com %s\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "desencripta��o correcta\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencripta��o falhou: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2728,7 +2838,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:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2741,12 +2851,12 @@ msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2789,7 +2899,7 @@ msgstr "cancelado pelo utilizador\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2799,20 +2909,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2820,51 +2930,56 @@ msgstr "Repita a frase secreta: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Assinatura desacoplada.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, 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:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de cifra %d � desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -2879,26 +2994,26 @@ msgstr "a pedir chave %08lX de %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "n�o consigo obterr chave do servidor: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nenhum servidor de chaves conhecido (utilize a op��o --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: n�o � um identificador de chave v�lido\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sucesso ao enviar para `%s' (estado=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "erro ao enviar para `%s': estado=%u\n"
@@ -2921,58 +3036,63 @@ 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorrecto devido a um bit cr�tico desconhecido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura %08lx expirou %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVISO: `%s' � um ficheiro vazio\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "AVISO: `%s' � um ficheiro vazio\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "desencripta��o falhou: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2984,12 +3104,12 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -2998,113 +3118,118 @@ msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel aceder: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: imposs�vel criar: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar tranca\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: imposs�vel criar tranca\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: imposs�vel criar: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
@@ -3156,8 +3281,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "'%s' n�o � um identificador de chave longo v�lido\n"
 
 #: g10/trustdb.c:501
@@ -3192,216 +3317,212 @@ msgstr ""
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: 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:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, 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:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de chave v�lida\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, 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:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Auto-assinatura v�lida"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inv�lida"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Revoga��o de ID de utilizador v�lida"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Revoga��o de ID de utilizador inv�lida"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Certificado de revoga��o v�lido"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revoga��o inv�lido"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Certificado inv�lido"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, 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:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inser��o falhou: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro ao ler registo de direct�rio: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves p�blicas\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, 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:2395
+#: g10/trustdb.c:2338
 #, 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:2399
+#: g10/trustdb.c:2342
 #, 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:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, 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:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, 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:2586
+#: g10/trustdb.c:2529
 #, 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:2589
+#: g10/trustdb.c:2532
 #, 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:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3417,34 +3538,6 @@ 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:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: imposs�vel criar porta-chaves: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: porta-chaves criado\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s � o n�o modificado\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s � o novo\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3520,24 +3613,14 @@ msgstr "%s: directoria criada\n"
 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"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dados encriptados com %s\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "encriptado com algoritmo desconhecido %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi encriptada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "problema ao tratar pacote encriptado\n"
 
@@ -3552,23 +3635,28 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Remover esta chave do porta-chaves?"
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-key\" para a apagar primeiro.\n"
 
@@ -3755,25 +3843,32 @@ msgstr ""
 "n�o consiga mais usar esta chave. Fa�a isto apenas se por alguma\n"
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
 msgstr "Por favor digite a frase secreta"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Por favor repita a frase secreta, para ter certeza do que digitou."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "D� o nome para o ficheiro ao qual a assinatura se aplica"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Responda \"sim\" se quiser escrever por cima do ficheiro"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3782,7 +3877,7 @@ msgstr ""
 "RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3811,7 +3906,7 @@ msgstr ""
 "     n�o deve ser mais utilizado; normalmente utilizada para indicar\n"
 "     que um endere�o de email � inv�lido.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3821,11 +3916,81 @@ msgstr ""
 "este certificado de revoga��o. Por favor mantenha este texto conciso.\n"
 "Uma linha vazia termina o texto.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
+
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: porta-chaves criado\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: porta-chaves criado\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s � o n�o modificado\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s � o novo\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "demasiados bits alet�rios pedidos; o limite s�o %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Para mais informa��es veja http://www.gnupg.org"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (assinatura e cifragem)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr ""
+#~ "Voc� quer realmente criar uma chave para assinatura e criptografia? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: utilizador n�o encontrado: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "erro de leitura do certificado: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: utilizador n�o encontrado\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr ""
+#~ "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: imposs�vel criar porta-chaves: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 4088e0f42..6cb77d2ee 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: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -21,39 +21,39 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Varning: anv�nder os�kert minne!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen �r ej m�jlig utan tillg�ng till s�kert minne\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 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"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "aA"
 
@@ -269,17 +269,17 @@ msgstr "felaktig publik nyckel"
 msgid "unusable secret key"
 msgstr "felaktig hemlig nyckel"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... detta �r en bugg (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
@@ -326,16 +326,11 @@ msgstr "kan inte skriva till \"%s\": %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:427
-#, c-format
-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:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -362,7 +357,7 @@ msgstr ""
 "en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
 "(Beh�ver %d fler byte)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -370,139 +365,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -512,156 +507,161 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|skriv statusinformation till denna FD"
+
+#: g10/g10.c:332
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -669,7 +669,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -689,17 +689,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -709,7 +709,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -717,66 +717,66 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -787,132 +787,142 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �r �nd� litet. Eventuellt borde meddelandena inte alls
 # �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
 # f�r internationella fels�kare
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "skriv ut inst�llningar"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [filnamn]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key anv�ndaridentitet"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
 "ett understrykningstecken (_)\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -920,11 +930,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -957,7 +967,7 @@ msgstr "felaktig bindestreck-kodad rad: "
 msgid "unexpected armor:"
 msgstr "ov�ntat skal:"
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades �ver\n"
@@ -974,7 +984,7 @@ msgstr "f�r tidigt filslut (i CRC-summan)\n"
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
@@ -987,20 +997,16 @@ msgstr "f�r tidigt filslut (i den avslutande raden)\n"
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "F�r information se http://www.gnupg.org/"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt skal: raden �r l�ngre �n %d tecken\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1010,7 +1016,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
@@ -1200,171 +1206,192 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Anv�nder en nyckel som inte �r betrodd!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har �terkallats av sin �gare!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Detta kan betyda att signaturen �r en f�rfalskning.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har �terkallats av sin �gare!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Notera: Denna nyckel har g�tt ut!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel �r inte certifierad med en p�litlig signatur!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillh�r �garen.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE p� denna nyckel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen �r sannolikt en F�RFALSKNING.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel �r inte certifierad med signaturer med ett\n"
 "tillr�ckligt h�gt tillitsv�rde!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 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:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s �verhoppad\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Du specificerade ingen anv�ndaridentitet. (du kan anv�nda \"-r\")\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Ange anv�ndaridentiteten: "
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "Hittade inte anv�ndaridentiteten.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 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:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 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:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade �ver: den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "hoppade �ver \"%s\": dubblett\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "skriv ut inst�llningar"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Ogiltigt tecken i namnet\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "skriver sj�lvsignatur\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; anv�nder %u bitar\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad upp�t till %u bitar\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "V�lj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:557
+#: g10/keygen.c:756
 #, fuzzy, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (signering och kryptering)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (endast signering)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
-#: g10/keygen.c:572
-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:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1377,19 +1404,19 @@ msgstr ""
 "              den f�rvalda nyckelstorleken �r 1024 bitar\n"
 "    den st�rsta f�reslagna nyckelstorleken �r 2048 bitar\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 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:620
+#: g10/keygen.c:824
 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:622
+#: g10/keygen.c:826
 #, 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"
@@ -1402,12 +1429,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:633
+#: g10/keygen.c:837
 #, 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:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1415,11 +1442,11 @@ msgstr ""
 "Nyckelstorlekar st�rre �n 2048 �r inte att rekommendera\n"
 "eftersom ber�kningar tar MYCKET l�ng tid!\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1427,22 +1454,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:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, 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:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1458,25 +1485,25 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n m�nader\n"
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "ogiltigt v�rde\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 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:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1484,11 +1511,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:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "St�mmer detta (j/n)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1504,44 +1531,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Namnet f�r inte b�rja med en siffra\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "Epostadressen �r ogiltig\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1552,28 +1579,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 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:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 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:899
+#: g10/keygen.c:1105
 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:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1581,11 +1608,11 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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"
@@ -1596,7 +1623,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:991
+#: g10/keygen.c:1197
 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"
@@ -1608,29 +1635,49 @@ 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:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1639,13 +1686,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:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1653,7 +1700,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:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1661,26 +1708,26 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte �ppna: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av l�senordsfras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
@@ -1690,56 +1737,56 @@ msgstr "%s: VARNING: tom fil\n"
 msgid "reading from `%s'\n"
 msgstr "l�ser fr�n \"%s\"\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad f�r: %s\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: hittade inte anv�ndaren: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "fel vid l�sning av certifikat: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, 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:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 #, fuzzy
 msgid "[User id not found]"
 msgstr "[hittade inte anv�ndaren]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, 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:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 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"
@@ -1749,7 +1796,7 @@ msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
 msgid "skipping block of type %d\n"
 msgstr "hoppar �ver block av typen %d\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
@@ -1819,50 +1866,46 @@ msgstr "antal importerade hemliga nycklar: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 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:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "ingen f�rvald publik nyckel\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
@@ -1872,126 +1915,131 @@ msgstr "nyckel %08lX: importerade publik nyckel\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, 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:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, 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:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny anv�ndaridentitet\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "ingen f�rvald publik nyckel\n"
+
+#: g10/import.c:652
 #, 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:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, 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:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, 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:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -2000,98 +2048,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:919
+#: g10/import.c:939
 #, 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:928
+#: g10/import.c:948
 #, 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:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, 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:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, 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:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: hittade inte anv�ndaren\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[�terkallelse]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[sj�lvsignatur]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 anv�ndaridentitet utan giltig sj�lvsignatur hittades\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, 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:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2099,7 +2142,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2107,33 +2150,33 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 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:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2141,7 +2184,7 @@ msgstr ""
 "Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2149,429 +2192,475 @@ msgstr ""
 "Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "pref"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "skriv ut inst�llningar"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "pref"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "skriv ut inst�llningar"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "�ndra l�senordsfrasen"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "�terkalla en sekund�r nyckel"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 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:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "fel vid l�sning av \"%s\": %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 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:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen �terkalla de valda nycklarna? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 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:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! en undernyckel har �terkallats: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- fel �terkallelser av nycklar\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 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:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 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:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2580,44 +2669,54 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 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:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �terkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s krypterad data\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "krypterad med en ok�nd algoritm %d\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln �r %08lX\n"
@@ -2629,114 +2728,123 @@ msgstr "den publika nyckeln �r %08lX\n"
 # r�tt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska �vers�ttningen �r mycket obskyrare �n engelska
 # originalet iallafall.
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s krypterad data\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n"
 "att applicera\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -2761,7 +2869,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:1010
+#: g10/parse-packet.c:1027
 #, 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"
@@ -2774,12 +2882,12 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
@@ -2823,7 +2931,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2833,20 +2941,20 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Ange l�senordsfras: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Repetera l�senordsfrasen: "
 
@@ -2854,52 +2962,57 @@ msgstr "Repetera l�senordsfrasen: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, anv�nd flaggan \"--output\" f�r att spara den\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "fel vid l�sning av \"%s\": %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "L�skopplad signatur.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "Ange namnet p� datafilen: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "l�ser fr�n standard in ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 #, fuzzy
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte �ppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, 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:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi �r den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln st�ds inte\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "chifferalgoritmen %d �r ok�nd eller avslagen\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, 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:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
@@ -2914,26 +3027,26 @@ msgstr "fr�ga efter nyckeln %08lX fr�n %s ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "k�nner inte till n�gon nyckelserver (anv�nd flaggan --keyserver)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ogiltig nyckelidentitet\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fel vid s�ndning till \"%s\": %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades s�nda till \"%s\": status=%u\n"
@@ -2956,60 +3069,65 @@ msgstr "Ogiltig l�senordsfras, f�rs�k igen ...\n"
 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:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "antar att MDC �r felaktig eftersom en ok�nd kritisk bit �r satt\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 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:305
+#: g10/sig-check.c:307
 #, 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:306
+#: g10/sig-check.c:308
 #, 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:328
+#: g10/sig-check.c:330
 #, fuzzy, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTERA: signaturnyckeln �r %08lX f�r gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 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:152
+#: g10/sign.c:220
 #, fuzzy, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "VARNING: \"%s\" �r en tom fil\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "VARNING: \"%s\" �r en tom fil\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "dekrypteringen misslyckades: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3021,12 +3139,12 @@ msgstr "kan inte hantera text med rader l�ngre �n %d tecken\n"
 msgid "input line longer than %d characters\n"
 msgstr "indataraden �r l�ngre �n %d tecken\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
@@ -3035,113 +3153,118 @@ msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion f�r stor\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ingen �tkomst: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: kan inte skapa: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: kan inte skapa l�s\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: kan inte skapa l�s\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: kan inte skapa: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: felaktig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: felaktig tillitsdatabas\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa hash-tabell: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid l�sning av versionspost: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: l�sning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ej en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid l�sning av ledig post: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid l�sning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollst�lla en post: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att l�gga till en post: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "tillitsdatabasen �r trasig, k�r \"gpg --fix-trustdb\".\n"
 
@@ -3196,7 +3319,7 @@ msgstr "get_dir_record: search_record misslyckades: %s\n"
 
 #: g10/trustdb.c:474
 #, fuzzy, c-format
-msgid "'%s' is not a valid long keyID\n"
+msgid "`%s' is not a valid long keyID\n"
 msgstr "%s: ogiltig nyckelidentitet\n"
 
 #: g10/trustdb.c:501
@@ -3229,219 +3352,215 @@ msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX �r INTE skyddad.\n"
 
-#: g10/trustdb.c:584
+#: 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:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "numrering av hemliga nycklar misslyckades: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "nyckel: %08lX.%lu: Korrekt bindning till undernyckel\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig bindning till undernyckel: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig �terkallelse av nyckel\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig �terkallelse av nyckel: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig �terkallelse av undernyckel\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Korrekt sj�lvsignatur"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 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:1170
+#: g10/trustdb.c:1171
 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:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Giltig �terkallelse av anv�ndaridentitet"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Ogiltig �terkallelse av anv�ndaridentitet"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Giltig �terkallelse av certifikat"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Korrekt certifikat"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Ogiltig �terkallelse av certifikat "
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Ogiltigt certifikat"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "signaturpost %lu[%d] pekar mot fel post.\n"
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "dubblett av certifikat - borttaget"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir misslyckades: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lokalt id ?: till�gg misslyckades: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lokalt id %lu: till�gg misslyckades: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lokalt id %lu: lades till\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fel vid l�sning av katalogpost: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu nycklar behandlade\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu nycklar med fel\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu nycklar tillagda\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, 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:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu p� grund av nya publika nycklar\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu nycklar hoppades �ver\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu nycklar uppdaterades\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Ooops, inga nycklar\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, inga anv�ndaridentiteter\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: s�kning av katalogpost misslyckades: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "nyckel %08lX: till�gg av tillitspost misslyckades: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "nyckel %08lX.%lu: lades till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, 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:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "nyckel %08lX.%lu: gick ut %s\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "nyckel %08lX.%lu: tillitskontroll misslyckades: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem att hitta \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "anv�ndaren \"%s\" finns inte tillitsdatabasen - l�gger till\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "VARNING: kan �nnu inte hantera l�nga inst�llningsposter\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3457,35 +3576,6 @@ 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:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: kan inte skapa nyckelring: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: nyckelring skapad\n"
-
-# m�rkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s �r den of�r�ndrade\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s �r den nya\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "L�s detta potentiella s�kerhetsproblem\n"
-
 # om n�gon kan tala om f�r mig vad detta betyder skulle jag bli j�tteglad!
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
@@ -3564,24 +3654,14 @@ msgstr "%s: katalog skapad\n"
 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"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s krypterad data\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "krypterad med en ok�nd algoritm %d\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel i det symmetriska\n"
 "chiffret.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 #, fuzzy
 msgid "problem handling encrypted packet\n"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
@@ -3597,23 +3677,28 @@ msgstr ""
 "kan inte undvika en svag nyckel f�r symmetriskt chiffer; f�rs�kte\n"
 "%d g�nger!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte g�ra s� i batch-l�ge utan flaggan \"--yes\"\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Detta �r en hemlig nyckel! - vill du verkligen ta bort den? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "numrering av nyckelblock misslyckades: %s\n"
+
+#: g10/delkey.c:184
 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:183
+#: g10/delkey.c:186
 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"
 
@@ -3805,8 +3890,15 @@ msgstr ""
 "mer. S� g�r bara detta om denna sj�lvsignatur av n�gon anledning �r\n"
 "ogiltig och det finns en andra signatur som tillg�nglig."
 
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
 # ej klar, eller?
-#: g10/helptext.c:202
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3814,20 +3906,20 @@ msgstr ""
 "Ange en l�senordsfras. Detta �r en hemlig mening\n"
 "[hj�lptexten ej f�rdigst�lld]"
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "Reptera l�senordsfrasen, s� du �r s�ker p� vad du skrev in."
 
 # # felstavat/ologiskt original
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "Ange namnet p� den fil signaturen g�ller"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Svara \"ja\" om det du vill skriva �ver filen"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3835,7 +3927,7 @@ msgstr ""
 "Ange ett nytt filnamn. Om du bara trycker RETUR kommer standarfilnamnet\n"
 "(som anges i hakparenteser) att anv�ndas."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 #, fuzzy
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
@@ -3866,7 +3958,7 @@ msgstr ""
 "     skall anv�ndas. Detta anv�nds normalt f�r att visa att en epostadress\n"
 "     �r ogiltig\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3876,15 +3968,85 @@ msgstr ""
 "detta �terkallelsecertifikat. F�rs�k att h�lla texten kort och koncis.\n"
 "En tom rad avslutar texten.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "Det finns ingen hj�lp tillg�nglig"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
 
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: nyckelring skapad\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: nyckelring skapad\n"
+
+# m�rkligt felmeddelande, kolla upp
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s �r den of�r�ndrade\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s �r den nya\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "L�s detta potentiella s�kerhetsproblem\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"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "F�r information se http://www.gnupg.org/"
+
+#, fuzzy
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (signering och kryptering)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr "Vill du verkligen skapa en nyckel f�r signering och kryptering? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: hittade inte anv�ndaren: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "fel vid l�sning av certifikat: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: hittade inte anv�ndaren\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "VARNING: kan �nnu inte hantera l�nga inst�llningsposter\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: kan inte skapa nyckelring: %s\n"
+
 #, fuzzy
 #~ msgid "invalid"
 #~ msgstr "felaktigt skal"
diff --git a/po/tr.po b/po/tr.po
index c00b914fb..139c8916c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4h.po\n"
-"POT-Creation-Date: 2001-05-29 08:58+0200\n"
+"POT-Creation-Date: 2001-09-07 10:33+0200\n"
 "PO-Revision-Date: 2001-05-24 06:42+300\n"
 "Last-Translator: Nilg�n Belma Bug�ner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -14,39 +14,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: util/secmem.c:84
+#: util/secmem.c:87
 msgid "Warning: using insecure memory!\n"
 msgstr "Uyar�: kullan�lan bellek g�venli de�il!\n"
 
-#: util/secmem.c:304
+#: util/secmem.c:322
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "g�venli bellek haz�rlanmadan i�lem yapmak m�mk�n de�il\n"
 
-#: util/secmem.c:305
+#: util/secmem.c:323
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu g�rev i�in yanl�� program kullanm�� olabilirsiniz)\n"
 
-#: util/miscutil.c:287 util/miscutil.c:316
+#: util/miscutil.c:287 util/miscutil.c:317
 msgid "yes"
 msgstr "evet"
 
-#: util/miscutil.c:288 util/miscutil.c:319
+#: util/miscutil.c:288 util/miscutil.c:320
 msgid "yY"
 msgstr "eE"
 
-#: util/miscutil.c:289 util/miscutil.c:317
+#: util/miscutil.c:289 util/miscutil.c:318
 msgid "no"
 msgstr "hay�r"
 
-#: util/miscutil.c:290 util/miscutil.c:320
+#: util/miscutil.c:290 util/miscutil.c:321
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:581 util/miscutil.c:318
+#: g10/keyedit.c:569 util/miscutil.c:319
 msgid "quit"
 msgstr "��k��"
 
-#: util/miscutil.c:321
+#: util/miscutil.c:322
 msgid "qQ"
 msgstr "��"
 
@@ -255,17 +255,17 @@ msgstr "genel anahtar kullan�md���"
 msgid "unusable secret key"
 msgstr "gizli anahtar kullan�md���"
 
-#: util/logger.c:224
+#: util/logger.c:249
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... bu bir yaz�l�m hatas� (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:255
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yaz�l�m hatas� buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1265
+#: cipher/random.c:320 g10/import.c:129 g10/keygen.c:1511
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' a��lam�yor: %s\n"
@@ -312,16 +312,11 @@ msgstr "\"%s\" yaz�lam�yor: %s\n"
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapat�lam�yor: %s\n"
 
-#: cipher/random.c:427
-#, c-format
-msgid "too many random bits requested; the limit is %d\n"
-msgstr "�ok fazla rasgele bit istendi; s�n�r: %d\n"
-
-#: cipher/random.c:661
+#: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullan�lan rasgele say� �reteci g�venli de�il!!\n"
 
-#: cipher/random.c:662
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -347,7 +342,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi i�in i�letim sistemine\n"
 "yard�mc� olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:216
+#: g10/g10.c:235
 msgid ""
 "@Commands:\n"
 " "
@@ -355,139 +350,139 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:218
+#: g10/g10.c:237
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:219
+#: g10/g10.c:238
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|a��k�a okunabilen bir imza yapar"
 
-#: g10/g10.c:220
+#: g10/g10.c:239
 msgid "make a detached signature"
 msgstr "ba��ms�z bir imza yapar"
 
-#: g10/g10.c:221
+#: g10/g10.c:240
 msgid "encrypt data"
 msgstr "veriyi �ifreler"
 
-#: g10/g10.c:222
+#: g10/g10.c:241
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik �ifre ile �ifreler"
 
-#: g10/g10.c:223
+#: g10/g10.c:242
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:224
+#: g10/g10.c:243
 msgid "decrypt data (default)"
 msgstr "veri �ifresini a�ar (�ntan�ml�)"
 
-#: g10/g10.c:225
+#: g10/g10.c:244
 msgid "verify a signature"
 msgstr "bir imzay� do�rular"
 
-#: g10/g10.c:227
+#: g10/g10.c:246
 msgid "list keys"
 msgstr "anahtarlar� listeler"
 
-#: g10/g10.c:229
+#: g10/g10.c:248
 msgid "list keys and signatures"
 msgstr "anahtarlar� ve imzalar� listeler"
 
-#: g10/g10.c:230
+#: g10/g10.c:249
 msgid "check key signatures"
 msgstr "anahtar imzalar�n� kontrol eder"
 
-#: g10/g10.c:231
+#: g10/g10.c:250
 msgid "list keys and fingerprints"
 msgstr "anahtarlar� ve parmak izlerini listeler"
 
-#: g10/g10.c:232
+#: g10/g10.c:251
 msgid "list secret keys"
 msgstr "gizli anahtarlar� listeler"
 
-#: g10/g10.c:233
+#: g10/g10.c:252
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar �ifti �retir"
 
-#: g10/g10.c:234
+#: g10/g10.c:253
 msgid "remove key from the public keyring"
 msgstr "genel anahtar demetinden anahtar� kald�r�r"
 
-#: g10/g10.c:236
+#: g10/g10.c:255
 msgid "remove key from the secret keyring"
 msgstr "gizli anahtar demetinden anahtar� kald�r�r"
 
-#: g10/g10.c:237
+#: g10/g10.c:256
 msgid "sign a key"
 msgstr "bir anahtar� imzalar"
 
-#: g10/g10.c:238
+#: g10/g10.c:257
 msgid "sign a key locally"
 msgstr "bir anahtar� yerel olarak imzalar"
 
-#: g10/g10.c:239
+#: g10/g10.c:258
 msgid "sign or edit a key"
 msgstr "bir anahtar� d�zenler ve imzalar"
 
-#: g10/g10.c:240
+#: g10/g10.c:259
 msgid "generate a revocation certificate"
 msgstr "bir y�r�rl�kten kald�rma sertifikas� �retir"
 
-#: g10/g10.c:241
+#: g10/g10.c:260
 msgid "export keys"
 msgstr "anahtarlar� g�nderir"
 
-#: g10/g10.c:242
+#: g10/g10.c:261
 msgid "export keys to a key server"
 msgstr "anahtarlar� bir anahtar sunucusuna g�nderir"
 
-#: g10/g10.c:243
+#: g10/g10.c:262
 msgid "import keys from a key server"
 msgstr "anahtarlar� bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:247
+#: g10/g10.c:266
 msgid "import/merge keys"
 msgstr "anahtarlar� indirir/kat��t�r�r"
 
-#: g10/g10.c:249
+#: g10/g10.c:268
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:251
+#: g10/g10.c:270
 msgid "export the ownertrust values"
 msgstr "sahibining�vencesi de�erlerini g�nderir"
 
-#: g10/g10.c:253
+#: g10/g10.c:272
 msgid "import ownertrust values"
 msgstr "sahibining�vencesi de�erlerini indirir"
 
-#: g10/g10.c:255
+#: g10/g10.c:274
 msgid "update the trust database"
 msgstr "g�vence veritaban�n� g�nceller"
 
-#: g10/g10.c:257
+#: g10/g10.c:276
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�S�MLER]|g�vence veritaban�n� kontrol eder"
 
-#: g10/g10.c:258
+#: g10/g10.c:277
 msgid "fix a corrupted trust database"
 msgstr "bozulan g�vence veritaban�n� onar�r"
 
-#: g10/g10.c:259
+#: g10/g10.c:278
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin z�rh�n� kald�r�r"
 
-#: g10/g10.c:261
+#: g10/g10.c:280
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi z�rhlar"
 
-#: g10/g10.c:263
+#: g10/g10.c:282
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti �z�mlemelerini g�sterir"
 
-#: g10/g10.c:267
+#: g10/g10.c:286
 msgid ""
 "@\n"
 "Options:\n"
@@ -497,159 +492,164 @@ msgstr ""
 "Se�enekler:\n"
 " "
 
-#: g10/g10.c:269
+#: g10/g10.c:288
 msgid "create ascii armored output"
 msgstr "ascii z�rhl� ��kt� olu�turur"
 
-#: g10/g10.c:271
+#: g10/g10.c:290
 msgid "|NAME|encrypt for NAME"
 msgstr "|�S�M|�S�M i�in �ifreleme yapar"
 
-#: g10/g10.c:274
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�S�M|�ntan�ml� al�c� olarak �S�M kullan�l�r"
 
-#: g10/g10.c:276
+#: g10/g10.c:295
 msgid "use the default key as default recipient"
 msgstr "�ntan�ml� al�c� olarak �ntan�ml� anahtar kullan�l�r"
 
-#: g10/g10.c:280
+#: g10/g10.c:299
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da �ifre ��zmek i�in bu kullan�c� kimli�i kullan�l�r"
 
-#: g10/g10.c:281
+#: g10/g10.c:300
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�k��t�rma seviyesi N olarak ayarlan�r (0 ise s�k��t�rma yap�lmaz)"
 
-#: g10/g10.c:283
+#: g10/g10.c:302
 msgid "use canonical text mode"
 msgstr "kurall� metin kipini kullan�r"
 
-#: g10/g10.c:284
+#: g10/g10.c:303
 msgid "use as output file"
 msgstr "��kt� dosyas� olarak kullan�l�r"
 
-#: g10/g10.c:285
+#: g10/g10.c:304
 msgid "verbose"
 msgstr "�ok detayl�"
 
-#: g10/g10.c:286
+#: g10/g10.c:305
 msgid "be somewhat more quiet"
 msgstr "daha az detayl�"
 
-#: g10/g10.c:287
+#: g10/g10.c:306
 msgid "don't use the terminal at all"
 msgstr "terminali hi� kullanma"
 
-#: g10/g10.c:288
+#: g10/g10.c:307
 msgid "force v3 signatures"
 msgstr "v3 imzalar�na zorlar"
 
-#: g10/g10.c:289
+#: g10/g10.c:308
 msgid "always use a MDC for encryption"
 msgstr "�ifreleme i�in daima bir MDC kullan�l�r"
 
-#: g10/g10.c:290
+#: g10/g10.c:309
 msgid "do not make any changes"
 msgstr "hi�bir de�i�iklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:292
+#: g10/g10.c:311
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:293
+#: g10/g10.c:312
 msgid "batch mode: never ask"
 msgstr "�nceden belirlenmi� i�lemler kipi: hi� sormaz"
 
-#: g10/g10.c:294
+#: g10/g10.c:313
 msgid "assume yes on most questions"
 msgstr "sorular�n �o�unda cevap evet farzedilir"
 
-#: g10/g10.c:295
+#: g10/g10.c:314
 msgid "assume no on most questions"
 msgstr "sorular�n �o�unda cevap hay�r farzedilir"
 
-#: g10/g10.c:296
+#: g10/g10.c:315
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar demetini anahtar demetleri listesine ekler"
 
-#: g10/g10.c:297
+#: g10/g10.c:316
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar demetini listeye ekler"
 
-#: g10/g10.c:298
+#: g10/g10.c:317
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�S�M|�ntan�ml� gizli anahtar olarak �S�M kullan�l�r"
 
-#: g10/g10.c:299
+#: g10/g10.c:318
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAK�NA|anahtarlar� aramak i�in bu anahtar sunucusu kullan�l�r"
 
-#: g10/g10.c:300
+#: g10/g10.c:319
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�S�M|terminal karakter setini �S�M olarak ayarlar"
 
-#: g10/g10.c:301
+#: g10/g10.c:320
 msgid "read options from file"
 msgstr "se�enekleri dosyadan okur"
 
-#: g10/g10.c:305
+#: g10/g10.c:324
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:310
+#: g10/g10.c:326
+#, fuzzy
+msgid "|[file]|write status info to file"
+msgstr "|FD|durum bilgisini bu FD'ye yazar"
+
+#: g10/g10.c:332
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANAHTAR-K�ML�K|bu anahtar son derece g�vence alt�nda"
 
-#: g10/g10.c:311
+#: g10/g10.c:333
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|geni�letme mod�l� olarak DOSYA y�klenir"
 
-#: g10/g10.c:312
+#: g10/g10.c:334
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de a��klanan kipi uygular"
 
-#: g10/g10.c:313
+#: g10/g10.c:335
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "t�m paket, �ifre ve �z�mleme se�eneklerini OpenPGP tarz�nda ayarlar"
 
-#: g10/g10.c:314
+#: g10/g10.c:336
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolas� kipi olarak N kullan�l�r"
 
-#: g10/g10.c:316
+#: g10/g10.c:338
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|�S�M|anahtar parolalar� i�in ileti �z�mleme algoritmas� olarak �S�M "
 "kullan�l�r"
 
-#: g10/g10.c:318
+#: g10/g10.c:340
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|�S�M|anahtar parolalar� i�in �ifre algoritmas� olarak �S�M kullan�l�r"
 
-#: g10/g10.c:319
+#: g10/g10.c:341
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�S�M|�ifre algoritmas� olarak �S�M kullan�l�r"
 
-#: g10/g10.c:320
+#: g10/g10.c:342
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�S�M|�z�mleme algoritmas� olarak �S�M kullan�l�r"
 
-#: g10/g10.c:321
+#: g10/g10.c:343
 msgid "|N|use compress algorithm N"
 msgstr "|N|s�k��t�rma algoritmas� olarak N kullan�l�r"
 
-#: g10/g10.c:322
+#: g10/g10.c:344
 msgid "throw keyid field of encrypted packets"
 msgstr "�ifreli paketlerin anahtar-kimlik alanlar�n� atar"
 
-#: g10/g10.c:323
+#: g10/g10.c:345
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|�S�M=DE�ER|veri bu nitelemeyle kullan�l�r"
 
-#: g10/g10.c:326
+#: g10/g10.c:348
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -657,7 +657,7 @@ msgstr ""
 "@\n"
 "(T�m komut ve se�eneklerin komple listesi i�in man sayfalar�na bak�n)\n"
 
-#: g10/g10.c:329
+#: g10/g10.c:351
 msgid ""
 "@\n"
 "Examples:\n"
@@ -677,15 +677,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarlar� listeler\n"
 " --fingerprint [isimler]    parmak izlerini g�sterir\n"
 
-#: g10/g10.c:438
+#: g10/g10.c:472
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yaz�l�m hatalar�n� l�tfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:442
+#: g10/g10.c:476
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullan�m�: gpg [se�enekler] [dosyalar] (yard�m i�in -h)"
 
-#: g10/g10.c:445
+#: g10/g10.c:479
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +695,7 @@ msgstr ""
 "imzalama, kontrol, �ifreleme veya ��zme\n"
 "�ntan�ml� i�lem girilen veriye ba��ml�d�r\n"
 
-#: g10/g10.c:452
+#: g10/g10.c:490
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,190 +703,200 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:531
+#: g10/g10.c:564
 msgid "usage: gpg [options] "
 msgstr "kullan�m�: gpg [se�enekler] "
 
-#: g10/g10.c:584
+#: g10/g10.c:621
 msgid "conflicting commands\n"
 msgstr "�eli�en komutlar\n"
 
-#: g10/g10.c:734
+#: g10/g10.c:777
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "B�LG�: \"%s\" �ntan�ml� se�enek dosyas� yok\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:781
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "se�enek dosyas� \"%s\": %s\n"
 
-#: g10/g10.c:745
+#: g10/g10.c:788
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den se�enekler okunuyor\n"
 
-#: g10/g10.c:950
+#: g10/g10.c:1030
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ge�erli bir karakter seti de�il\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1113
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyas� olu�turabilir!\n"
 
-#: g10/g10.c:1028 g10/g10.c:1037
+#: g10/g10.c:1117 g10/g10.c:1126
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "B�LG�: %s normal kullan�m i�in de�il!\n"
 
-#: g10/g10.c:1030
+#: g10/g10.c:1119
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullan�lmaz!\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1122
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1053 g10/g10.c:1065
+#: g10/g10.c:1142 g10/g10.c:1154
 msgid "selected cipher algorithm is invalid\n"
 msgstr "se�ilen �ifre algoritmas� ge�ersiz\n"
 
-#: g10/g10.c:1059 g10/g10.c:1071
+#: g10/g10.c:1148 g10/g10.c:1160
 msgid "selected digest algorithm is invalid\n"
 msgstr "se�ilen �z�mleme algoritmas� ge�ersiz\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1164
 msgid "the given policy URL is invalid\n"
 msgstr "verilmi� g�venlik URL(=web adresi) ge�ersiz\n"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1167
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "s�k��t�rma algoritmas� %d..%d aral���nda olmal�\n"
 
-#: g10/g10.c:1080
+#: g10/g10.c:1169
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan b�y�k olmal�\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1171
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den b�y�k olmal�\n"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1173
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 aras�nda olmal�\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1176
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "B�LG�: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1180
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi ge�ersiz; 0, 1 veya 3 olmal�\n"
 
-#: g10/g10.c:1176
+#: g10/g10.c:1184
+#, fuzzy
+msgid "invalid preferences\n"
+msgstr "�nayarlar� listeler"
+
+#: g10/g10.c:1267
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" g�vence veritaban� ba�lang�� a�amas�nda ba�ar�s�z: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1273
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1189
+#: g10/g10.c:1280
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1288
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1210
+#: g10/g10.c:1301
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1314
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1328
+#, fuzzy
+msgid "--sign --symmetric [filename]"
+msgstr "--symmetric [dosyaismi]"
+
+#: g10/g10.c:1337
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1355
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1363
 msgid "--sign-key user-id"
 msgstr "--sign-key kullan�c�-kimli�i"
 
-#: g10/g10.c:1270
+#: g10/g10.c:1371
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullan�c�-kimli�i"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1379
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullan�c�-kimli�i [komutlar]"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1395
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key kullan�c�-kimli�i"
 
-#: g10/g10.c:1297
+#: g10/g10.c:1398
 msgid "--delete-key user-id"
 msgstr "--delete-key kullan�c�-kimli�i"
 
-#: g10/g10.c:1305
+#: g10/g10.c:1406
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key kullan�c�-kimli�i"
 
-#: g10/encode.c:268 g10/g10.c:1342 g10/sign.c:410
+#: g10/encode.c:268 g10/g10.c:1443 g10/sign.c:632
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: g10/g10.c:1357
+#: g10/g10.c:1458
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullan�c�-kimli�i] [anahtar-demeti]"
 
-#: g10/g10.c:1423
+#: g10/g10.c:1524
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "z�rh�n kald�r�lmas� ba�ar�s�z: %s\n"
 
-#: g10/g10.c:1431
+#: g10/g10.c:1532
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "z�rhlama ba�ar�s�z: %s\n"
 
-#: g10/g10.c:1502
+#: g10/g10.c:1603
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritmas� ge�ersiz\n"
 
-#: g10/g10.c:1589
+#: g10/g10.c:1690
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1694
 msgid "Go ahead and type your message ...\n"
 msgstr "�letinizi yaz�n ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1596 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1697 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' a��lamad�\n"
 
-#: g10/g10.c:1805
+#: g10/g10.c:1906
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "bir niteleme isminin ilk karakteri bir harf ya da alt�izgi olmal�\n"
 
-#: g10/g10.c:1811
+#: g10/g10.c:1912
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -894,13 +904,13 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar, nokta ve alt�izgiler i�erebilir "
 "ve bir '=' i�areti ile biter\n"
 
-#: g10/g10.c:1817
+#: g10/g10.c:1918
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "bir niteleme isminde noktalar di�er karakterler taraf�ndan ku�at�lm�� "
 "olmal�d�r\n"
 
-#: g10/g10.c:1825
+#: g10/g10.c:1926
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme de�erinde kontrol karakterleri kullan�lamaz\n"
 
@@ -933,7 +943,7 @@ msgstr "ara�izgisi escape'l� sat�r ge�ersiz: "
 msgid "unexpected armor:"
 msgstr "beklenmeyen z�rh: "
 
-#: g10/armor.c:667 g10/armor.c:1235
+#: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ge�ersiz radix64 karakteri %02x atland�\n"
@@ -950,7 +960,7 @@ msgstr "dosya sonu belirsiz (CRC i�inde)\n"
 msgid "malformed CRC\n"
 msgstr "CRC bozulmu�\n"
 
-#: g10/armor.c:752 g10/armor.c:1272
+#: g10/armor.c:752 g10/armor.c:1271
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC hatas�; %06lx - %06lx\n"
@@ -963,20 +973,16 @@ msgstr "dosya sonu belirsiz (kuyruk i�inde)\n"
 msgid "error in trailer line\n"
 msgstr "kuyruk sat�r�nda hata\n"
 
-#: g10/armor.c:922
-msgid "For info see http://www.gnupg.org"
-msgstr "Bilgi i�in http://www.gnupg.org adresine bak�n"
-
-#: g10/armor.c:1050
+#: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
 msgstr "ge�erli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1055
+#: g10/armor.c:1054
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ge�ersiz z�rh: sat�r %d karakterden uzun\n"
 
-#: g10/armor.c:1059
+#: g10/armor.c:1058
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -985,7 +991,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1243 g10/pkclist.c:53
+#: g10/keyedit.c:1263 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "              Parmak izi:"
 
@@ -1168,60 +1174,60 @@ msgstr ""
 msgid "WARNING: Using untrusted key!\n"
 msgstr "UYARI: G�vencesiz anahtar kullan�l�yor!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:654
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi taraf�ndan y�r�rl�kten kald�r�lm��t�!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:655
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Bu imza sahte anlam�na gelebilir.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:660
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr ""
 "UYARI: Bu yard�mc� anahtar sahibi taraf�ndan y�r�rl�kten kald�r�lm��t�!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:682
 msgid "Note: This key has expired!\n"
 msgstr "Not: Bu anahtar�n kullan�m s�resi dolmu�tu!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:690
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar g�venceli bir imza ile sertifikalanmam��!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:692
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzan�n sahibine ait oldu�unu belirten bir i�aret yok.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:709
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara g�vence vermiyoruz!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:710
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:719
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "UYARI: Bu anahtar yeterince g�venceli imzalarla sertifikalanmam��!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:722
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzan�n sahibine ait oldu�u kesin de�il.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
+#: g10/pkclist.c:828 g10/pkclist.c:851 g10/pkclist.c:979 g10/pkclist.c:1043
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atland�: %s\n"
 
-#: g10/pkclist.c:826 g10/pkclist.c:993
+#: g10/pkclist.c:837 g10/pkclist.c:1017
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atland�: genel anahtar zaten mevcut\n"
 
-#: g10/pkclist.c:853
+#: g10/pkclist.c:866
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1229,109 +1235,130 @@ msgstr ""
 "Bir kullan�c� kimli�i belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 "\n"
 
-#: g10/pkclist.c:863
+#: g10/pkclist.c:876
 msgid "Enter the user ID: "
 msgstr "Kullan�c� kimli�ini girin:"
 
-#: g10/pkclist.c:875
+#: g10/pkclist.c:888
 msgid "No such user ID.\n"
 msgstr "B�yle bir kullan�c� kimli�i yok.\n"
 
-#: g10/pkclist.c:880
+#: g10/pkclist.c:893
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atland�: genel anahtar zaten �ntan�ml� al�c� olarak ayarlanm��\n"
 
-#: g10/pkclist.c:903
+#: g10/pkclist.c:916
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:910
+#: g10/pkclist.c:923
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "atland�: genel anahtar --encrypt-to ile zaten ayarlanm��\n"
 
-#: g10/pkclist.c:941
+#: g10/pkclist.c:954
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "�ntan�ml� al�c� `%s' bilinmiyor\n"
 
-#: g10/pkclist.c:974
+#: g10/pkclist.c:990
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: anahtar kontrol edilirken hata: %s\n"
 
-#: g10/pkclist.c:979
+#: g10/pkclist.c:999
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atland�: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1017
+#: g10/pkclist.c:1049
 msgid "no valid addressees\n"
 msgstr "ge�erli adresler yok\n"
 
-#: g10/keygen.c:176
+#: g10/keygen.c:178
+#, c-format
+msgid "preference %c%lu is not valid\n"
+msgstr ""
+
+#: g10/keygen.c:183
+#, fuzzy, c-format
+msgid "preference %c%lu duplicated\n"
+msgstr "`%s' atland�: tekrarlanm��\n"
+
+#: g10/keygen.c:188
+#, fuzzy, c-format
+msgid "too many `%c' preferences\n"
+msgstr "�nayarlar� listeler"
+
+#: g10/keygen.c:241
+#, fuzzy
+msgid "invalid character in string\n"
+msgstr "Ad ve soyad�n�zda ge�ersiz karakter var\n"
+
+#: g10/keygen.c:371
 msgid "writing self signature\n"
 msgstr "�z-imza yaz�l�yor\n"
 
-#: g10/keygen.c:217
+#: g10/keygen.c:415
 msgid "writing key binding signature\n"
 msgstr "anahtar� garantileyen imzay� yaz�yor\n"
 
-#: g10/keygen.c:269 g10/keygen.c:353 g10/keygen.c:445
+#: g10/keygen.c:469 g10/keygen.c:553 g10/keygen.c:644
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunlu�u ge�ersiz; %u bit kullan�l�yor\n"
 
-#: g10/keygen.c:274 g10/keygen.c:358 g10/keygen.c:450
+#: g10/keygen.c:474 g10/keygen.c:558 g10/keygen.c:649
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunlu�u %u bite yuvarland�\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:749
 msgid "Please select what kind of key you want:\n"
 msgstr "L�tfen istedi�iniz anahtar� se�iniz:\n"
 
-#: g10/keygen.c:551
+#: g10/keygen.c:751
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ve ElGamal (�ntan�ml�)\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:752
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yaln�z imzalamak i�in)\n"
 
-#: g10/keygen.c:554
+#: g10/keygen.c:754
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yaln�z �ifrelemek i�in)\n"
 
-#: g10/keygen.c:555
+#: g10/keygen.c:755
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (imzalamak ve �ifrelemek i�in)\n"
 
-#: g10/keygen.c:557
-#, c-format
-msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) RSA (imzalamak ve �ifrelemek i�in)\n"
+#: g10/keygen.c:756
+#, fuzzy, c-format
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) DSA (yaln�z imzalamak i�in)\n"
+
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (yaln�z �ifrelemek i�in)\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:761
 msgid "Your selection? "
 msgstr "Se�iminiz? "
 
-#: g10/keygen.c:572
-msgid "Do you really want to create a sign and encrypt key? "
-msgstr "Bir imza ve �ifreleme anahtar� olu�turmay� ger�ekten istiyor musunuz? "
-
-#: g10/keygen.c:580
+#: g10/keygen.c:781
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Bu algoritman�n kullan�m� uygun de�il - Yine de olu�turulsun mu?"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:795
 msgid "Invalid selection.\n"
 msgstr "Se�im ge�ersiz.\n"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:808
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1344,19 +1371,19 @@ msgstr ""
 "                  �ntan�ml� anahtar uzunlu�u: 1024 bit\n"
 "    �nerilebilecek en b�y�k anahtar uzunlu�u: 2048 bit\n"
 
-#: g10/keygen.c:613
+#: g10/keygen.c:817
 msgid "What keysize do you want? (1024) "
 msgstr "�stedi�iniz anahtar uzunlu�u nedir? (1024) "
 
-#: g10/keygen.c:618
+#: g10/keygen.c:822
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA anahtar�n�n uzunlu�u 512 ile 1024 bit aras�nda olabilir\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:824
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "anahtar uzunlu�u �ok k���k; en k���k anahtar uzunlu�u 768 bit'tir.\n"
 
-#: g10/keygen.c:622
+#: g10/keygen.c:826
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 "anahtar uzunlu�u �ok k���k; RSA anahtar� i�in en k���k uzunluk: 1024 bit\n"
@@ -1369,12 +1396,12 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:633
+#: g10/keygen.c:837
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "anahtar uzunlu�u �ok b�y�k; izin verilen en b�y�k de�er: %d bit\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:842
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1382,11 +1409,11 @@ msgstr ""
 "Hesaplama EPEYCE UZUN zaman alaca��ndan anahtar uzunluklar�nda 2048 bitten "
 "fazlas� tavsiye edilmez.\n"
 
-#: g10/keygen.c:641
+#: g10/keygen.c:845
 msgid "Are you sure that you want this keysize? "
 msgstr "Bu anahtar uzunlu�unu istedi�inizden emin misiniz? "
 
-#: g10/keygen.c:642
+#: g10/keygen.c:846
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1394,21 +1421,21 @@ msgstr ""
 "Pekala, �imdi monit�r ve klavyeden uzakla��n! Anahtar �retimi s�ras�ndaki bu "
 "ayg�tlardan yay�lacak radyasyon size zarar verebilir!\n"
 
-#: g10/keygen.c:650
+#: g10/keygen.c:854
 msgid "Do you really need such a large keysize? "
 msgstr "Bu kadar b�y�k anahtar uzunlu�una ger�ekten ihtiyac�n�z var m�?"
 
-#: g10/keygen.c:656
+#: g10/keygen.c:860
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�stenen anahtar uzunlu�u: %u bit\n"
 
-#: g10/keygen.c:659 g10/keygen.c:663
+#: g10/keygen.c:863 g10/keygen.c:867
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarland�\n"
 
-#: g10/keygen.c:711
+#: g10/keygen.c:915
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1424,25 +1451,25 @@ msgstr ""
 "      <n>m = anahtar n ay ge�erli\n"
 "      <n>y = anahtar n y�l ge�erli\n"
 
-#: g10/keygen.c:726
+#: g10/keygen.c:930
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar ge�erli olacak? (0) "
 
-#: g10/keygen.c:731
+#: g10/keygen.c:935
 msgid "invalid value\n"
 msgstr "de�er hatal�\n"
 
-#: g10/keygen.c:736
+#: g10/keygen.c:940
 msgid "Key does not expire at all\n"
 msgstr "Anahtar s�resiz ge�erli\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:742
+#: g10/keygen.c:946
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtar�n son kullanma tarihi: %s\n"
 
-#: g10/keygen.c:745
+#: g10/keygen.c:951
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1450,11 +1477,11 @@ msgstr ""
 "Sisteminiz 2038 y�l�ndan sonraki tarihleri g�steremiyor.\n"
 "Ama emin olun ki 2106 y�l�na kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:750
+#: g10/keygen.c:956
 msgid "Is this correct (y/n)? "
 msgstr "Bu do�ru mu? (e/h)? "
 
-#: g10/keygen.c:793
+#: g10/keygen.c:999
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1470,44 +1497,44 @@ msgstr ""
 "    \"Fatih Sultan Mehmet (padisah) <[email protected]>\"\n"
 "�eklinde olu�turur.\n"
 
-#: g10/keygen.c:805
+#: g10/keygen.c:1011
 msgid "Real name: "
 msgstr "Ad�n�z ve Soyad�n�z: "
 
-#: g10/keygen.c:813
+#: g10/keygen.c:1019
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyad�n�zda ge�ersiz karakter var\n"
 
-#: g10/keygen.c:815
+#: g10/keygen.c:1021
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyad�n�z bir rakamla ba�lamamal�\n"
 
-#: g10/keygen.c:817
+#: g10/keygen.c:1023
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyad�n�z en az 5 harfli olmal�\n"
 
-#: g10/keygen.c:825
+#: g10/keygen.c:1031
 msgid "Email address: "
 msgstr "Eposta adresiniz: "
 
-#: g10/keygen.c:836
+#: g10/keygen.c:1042
 msgid "Not a valid email address\n"
 msgstr "ge�erli bir Eposta adresi de�il\n"
 
-#: g10/keygen.c:844
+#: g10/keygen.c:1050
 msgid "Comment: "
 msgstr "A��klama: "
 
-#: g10/keygen.c:850
+#: g10/keygen.c:1056
 msgid "Invalid character in comment\n"
 msgstr "A��klama alan�nda ge�ersiz karakter\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:1079
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter setini kullan�yorsunuz.\n"
 
-#: g10/keygen.c:879
+#: g10/keygen.c:1085
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1518,29 +1545,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:1089
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "L�tfen Eposta adresinizi Ad� ve Soyad� veya A��klama alan� i�ine koymay�n\n"
 
-#: g10/keygen.c:888
+#: g10/keygen.c:1094
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTt��"
 
-#: g10/keygen.c:898
+#: g10/keygen.c:1104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)d� ve Soyad�, (Y)orum, (E)posta alanlar�n� de�i�tir ya da (�)�k? "
 
-#: g10/keygen.c:899
+#: g10/keygen.c:1105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "(A)d� ve Soyad�, (Y)orum, (E)posta alanlar�n� de�i�tir ya da (T)amam/(�)�k? "
 
-#: g10/keygen.c:918
+#: g10/keygen.c:1124
 msgid "Please correct the error first\n"
 msgstr "L�tfen �nce hatay� d�zeltin\n"
 
-#: g10/keygen.c:956
+#: g10/keygen.c:1162
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1548,11 +1575,11 @@ msgstr ""
 "Gizli anahtar�n�z� korumak i�in bir anahtar parolas�na gereksiniminiz var.\n"
 "\n"
 
-#: g10/keyedit.c:469 g10/keygen.c:964
+#: g10/keyedit.c:457 g10/keygen.c:1170
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "anahtar parolas� do�ru olarak tekrarlanmad�; tekrar deneyin.\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:1176
 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 +1591,7 @@ msgstr ""
 "se�ene�i ile kullanarak her zaman de�i�tirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:991
+#: g10/keygen.c:1197
 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"
@@ -1577,29 +1604,49 @@ msgstr ""
 "iyi olacakt�r; bu yeterli rasgele bayt kazanmak i�in rasgele say�\n"
 "�reticisine yard�mc� olur. \n"
 
-#: g10/keygen.c:1440
+#: g10/keygen.c:1687
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar �ifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1483
+#: g10/keygen.c:1741
 msgid "Key generation canceled.\n"
 msgstr "Anahtar �retimi durduruldu.\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1829 g10/keygen.c:1909
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtar� `%s'e yaz�yor\n"
 
-#: g10/keygen.c:1582
+#: g10/keygen.c:1830 g10/keygen.c:1911
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtar� `%s'e yaz�yor\n"
 
-#: g10/keygen.c:1679
+#: g10/keygen.c:1898
+#, fuzzy, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "anahtar %08lX: genel anahtar bulunamad�: %s\n"
+
+#: g10/keygen.c:1904
+#, fuzzy, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "anahtar %08lX: gizli anahtar bulunamad�: %s\n"
+
+#: g10/keygen.c:1918
+#, fuzzy, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
+
+#: g10/keygen.c:1925
+#, fuzzy, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
+
+#: g10/keygen.c:1939
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar �retildi ve imzaland�.\n"
 
-#: g10/keygen.c:1684
+#: g10/keygen.c:1945
 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"
@@ -1608,12 +1655,12 @@ msgstr ""
 "�ifrelemede kullanmak amac�yla ikinci bir anahtar �retmek isterseniz\n"
 "\"--edit-key\" se�ene�ini kullanabilirsiniz.\n"
 
-#: g10/keygen.c:1701 g10/keygen.c:1810
+#: g10/keygen.c:1957 g10/keygen.c:2063
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar �retimi ba�ar�s�zl��a u�rad�: %s\n"
 
-#: g10/keygen.c:1748 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:2001 g10/sig-check.c:317 g10/sign.c:180
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1621,7 +1668,7 @@ msgstr ""
 "anahtar bundan %lu saniye sonra �retilmi�ti.\n"
 "(zaman sapmas� veya saat problemi)\n"
 
-#: g10/keygen.c:1750 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:2003 g10/sig-check.c:319 g10/sign.c:182
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1629,26 +1676,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra �retilmi�ti.\n"
 "(zaman sapmas� veya saat problemi)\n"
 
-#: g10/keygen.c:1759
+#: g10/keygen.c:2012
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:1786
+#: g10/keygen.c:2039
 msgid "Really create? "
 msgstr "Ger�ekten olu�turulacak m�? "
 
-#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:454
-#: g10/tdbio.c:515
+#: g10/encode.c:91 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:463
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: a��lamad�: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:113 g10/sign.c:866
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolas� olu�turulurken hata: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:327
+#: g10/encode.c:171 g10/encode.c:329
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: UYARI: dosya bo�\n"
@@ -1658,55 +1705,55 @@ msgstr "%s: UYARI: dosya bo�\n"
 msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
-#: g10/encode.c:497
+#: g10/encode.c:505
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s %s i�in �ifrelendi\n"
 
-#: g10/export.c:153
-#, c-format
-msgid "%s: user not found: %s\n"
-msgstr "%s: kullan�c� bulunamad�: %s\n"
+#: g10/delkey.c:69 g10/export.c:149
+#, fuzzy, c-format
+msgid "key `%s' not found: %s\n"
+msgstr "kullan�c� \"%s\" bulunamad�: %s\n"
 
-#: g10/export.c:162
-#, c-format
-msgid "certificate read problem: %s\n"
-msgstr "sertifika okuma problemi: %s\n"
+#: g10/delkey.c:77 g10/export.c:159
+#, fuzzy, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/export.c:171
+#: g10/export.c:167
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtar�: bir RFC2440 anahtar� de�il - atland�\n"
 
-#: g10/export.c:182
+#: g10/export.c:178
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtar�: korunmam�� - atland�\n"
 
-#: g10/export.c:236
+#: g10/export.c:231
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hi�bir �ey d��ar� aktar�lmad�\n"
 
-#: g10/getkey.c:214
+#: g10/getkey.c:156
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belle�inde �ok fazla girdi - iptal edildi\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:249 g10/getkey.c:2525
+#: g10/getkey.c:191 g10/getkey.c:2267
 msgid "[User id not found]"
 msgstr "[Kullan�c� kimli�i bulunamad�]"
 
-#: g10/getkey.c:453
+#: g10/getkey.c:395
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk belle�inde �ok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:2196
+#: g10/getkey.c:1990
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "yard�mc� anahtar %08lX, as�l anahtar %08lX yerine kullan�l�yor\n"
 
-#: g10/getkey.c:2238 g10/trustdb.c:577
+#: g10/getkey.c:2031 g10/trustdb.c:578
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
@@ -1716,7 +1763,7 @@ msgstr "%08lX anahtar�: genel anahtars�z gizli anahtar - atland�\n"
 msgid "skipping block of type %d\n"
 msgstr "%d tipindeki blok atland�\n"
 
-#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1749 g10/trustdb.c:1790
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "�u ana kadar her�ey yolunda giderek %lu anahtar i�lenmi�\n"
@@ -1786,50 +1833,46 @@ msgstr "  gizli anahtarlar indirildi: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " gizli anahtarlar de�i�medi: %lu\n"
 
-#: g10/import.c:408 g10/import.c:617
+#: g10/import.c:407 g10/import.c:627
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "anahtar %08lX: kullan�c� kimli�i yok\n"
 
-#: g10/import.c:422
+#: g10/import.c:421
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "anahtar %08lX: kullan�c� kimli�i ge�erli de�il\n"
 
-#: g10/import.c:424
+#: g10/import.c:423
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kay�p bir �z-imza y�z�nden meydana gelebilir\n"
 
-#: g10/import.c:435 g10/import.c:684
+#: g10/import.c:434 g10/import.c:696
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamad�: %s\n"
 
-#: g10/import.c:440
+#: g10/import.c:439
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atland�\n"
 
-#: g10/import.c:448
-msgid "no default public keyring\n"
-msgstr "genel anahtar demeti �ntan�ml� de�il\n"
+#: g10/import.c:449
+#, fuzzy, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
 
-#: g10/import.c:452 g10/openfile.c:244 g10/sign.c:312 g10/sign.c:635
+#: g10/import.c:453 g10/openfile.c:244 g10/sign.c:571 g10/sign.c:726
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yaz�yor\n"
 
-#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "\"%s\" anahtar demeti kilitlenemez: %s\n"
-
-#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
+#: g10/import.c:456 g10/import.c:527 g10/import.c:647 g10/import.c:755
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
 
-#: g10/import.c:463
+#: g10/import.c:461
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "anahtar %08lX: genel anahtar indirildi\n"
@@ -1839,126 +1882,131 @@ msgstr "anahtar %08lX: genel anahtar indirildi\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "anahtar %08lX: bizim kopyam�zla e�le�mez\n"
 
-#: g10/import.c:489 g10/import.c:692
+#: g10/import.c:498 g10/import.c:713
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "anahtar %08lX: �zg�n anahtar bloku bulunamad�: %s\n"
 
-#: g10/import.c:495 g10/import.c:698
+#: g10/import.c:505 g10/import.c:719
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "anahtar %08lX: �zg�n anahtar bloku okunamad�: %s\n"
 
-#: g10/import.c:522
+#: g10/import.c:533
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "anahtar %08lX: 1 yeni kullan�c� kimli�i\n"
 
-#: g10/import.c:525
+#: g10/import.c:536
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "anahtar %08lX: %d yeni kullan�c� kimli�i\n"
 
-#: g10/import.c:528
+#: g10/import.c:539
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "anahtar %08lX: 1 yeni imza\n"
 
-#: g10/import.c:531
+#: g10/import.c:542
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "anahtar %08lX: %d yeni imza\n"
 
-#: g10/import.c:534
+#: g10/import.c:545
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "anahtar %08lX: bir yeni yard�mc� anahtar\n"
 
-#: g10/import.c:537
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "anahtar %08lX: %d yeni yard�mc� anahtar\n"
 
-#: g10/import.c:547
+#: g10/import.c:558
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "anahtar %08lX: de�i�medi\n"
 
-#: g10/import.c:610
+#: g10/import.c:620
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr "%08lX gizli anahtar� al�namad� (izin vermek i�in %s kullan�n)\n"
 
-#: g10/import.c:640
+#: g10/import.c:641
+#, fuzzy, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "genel anahtar demeti �ntan�ml� de�il\n"
+
+#: g10/import.c:652
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
 #. we can't merge secret keys
-#: g10/import.c:644
+#: g10/import.c:656
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar demetinde\n"
 
-#: g10/import.c:649
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamad�: %s\n"
 
-#: g10/import.c:678
+#: g10/import.c:690
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %08lX: genel anahtar de�il - y�r�rl�kten kald�rma sertifikas� "
 "uygulanamaz\n"
 
-#: g10/import.c:709
+#: g10/import.c:730
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %08lX: y�r�rl�kten kald�rma sertifikas� ge�ersiz: %s - reddedildi\n"
 
-#: g10/import.c:741
+#: g10/import.c:760
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "anahtar %08lX: y�r�rl�kten kald�rma sertifikas� indirildi\n"
 
-#: g10/import.c:783
+#: g10/import.c:803
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "anahtar %08lX: imza i�in kullan�c� kimli�i yok\n"
 
-#: g10/import.c:790 g10/import.c:814
+#: g10/import.c:810 g10/import.c:834
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritmas� desteklenmiyor\n"
 
-#: g10/import.c:791
+#: g10/import.c:811
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "anahtar %08lX: �z-imza ge�ersiz\n"
 
-#: g10/import.c:806
+#: g10/import.c:826
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "anahtar %08lX: anahtar� garantilemek i�in yard�mc� anahtar yok\n"
 
-#: g10/import.c:815
+#: g10/import.c:835
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "anahtar %08lX: yard�mc� anahtar garantileme ge�ersiz\n"
 
-#: g10/import.c:842
+#: g10/import.c:862
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "anahtar %08lX: �z-imzal� olmayan kullan�c� kimli�i kabul edildi: '"
 
-#: g10/import.c:871
+#: g10/import.c:891
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "anahtar %08lX: kullan�c� kimli�i atland�: '"
 
-#: g10/import.c:894
+#: g10/import.c:914
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "anahtar %08lX: yard�mc� anahtar atland�\n"
@@ -1967,100 +2015,95 @@ msgstr "anahtar %08lX: yard�mc� anahtar atland�\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:919
+#: g10/import.c:939
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "anahtar %08lX: imza g�nderilebilir de�il (%02x s�n�f�) - atland�\n"
 
-#: g10/import.c:928
+#: g10/import.c:948
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "anahtar %08lX: y�r�rl�kten kald�rma sertifikas� yanl�� yerde - atland�\n"
 
-#: g10/import.c:936
+#: g10/import.c:956
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 "anahtar %08lX: y�r�rl�kten kald�rma sertifikas� ge�ersiz: %s - atland�\n"
 
-#: g10/import.c:1036
+#: g10/import.c:1056
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "anahtar %08lX: �ift kullan�c� kimli�i saptand� - kat��t�r�ld�\n"
 
-#: g10/import.c:1088
+#: g10/import.c:1108
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "anahtar %08lX: y�r�rl�kten kald�rma sertifikas� eklendi\n"
 
-#: g10/import.c:1202 g10/import.c:1255
+#: g10/import.c:1222 g10/import.c:1275
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "anahtar %08lX: bizim kopya �z-imzaya sahip de�il\n"
 
-#: g10/delkey.c:67 g10/keyedit.c:94
-#, c-format
-msgid "%s: user not found\n"
-msgstr "%s: kullan�c� bulunamad�\n"
-
-#: g10/keyedit.c:156
+#: g10/keyedit.c:134
 msgid "[revocation]"
 msgstr "[y�r�rl�kten kald�rma]"
 
-#: g10/keyedit.c:157
+#: g10/keyedit.c:135
 msgid "[self-signature]"
 msgstr "[�z-imza]"
 
-#: g10/keyedit.c:221
+#: g10/keyedit.c:199
 msgid "1 bad signature\n"
 msgstr "1 k�t� imza\n"
 
-#: g10/keyedit.c:223
+#: g10/keyedit.c:201
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d k�t� imza\n"
 
-#: g10/keyedit.c:225
+#: g10/keyedit.c:203
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kay�p bir anahtar y�z�nden kontrol edilmedi\n"
 
-#: g10/keyedit.c:227
+#: g10/keyedit.c:205
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kay�p bir anahtar y�z�nden kontrol edilmedi\n"
 
-#: g10/keyedit.c:229
+#: g10/keyedit.c:207
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata y�z�nden kontrol edilmedi\n"
 
-#: g10/keyedit.c:231
+#: g10/keyedit.c:209
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolay� kontrol edilmedi\n"
 
-#: g10/keyedit.c:233
+#: g10/keyedit.c:211
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 �z-imzas� ge�ersiz kullan�c� kimli�i saptand�\n"
 
-#: g10/keyedit.c:235
+#: g10/keyedit.c:213
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d �z-imzas� ge�ersiz kullan�c� kimli�i saptand�\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:317
+#: g10/keyedit.c:297
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "%08lX anahtar� taraf�ndan zaten imzalanm��\n"
 
-#: g10/keyedit.c:325
+#: g10/keyedit.c:308
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtar� ile imzalanacak hi�bir �ey yok\n"
 
-#: g10/keyedit.c:334
+#: g10/keyedit.c:317
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2068,7 +2111,7 @@ msgstr ""
 "Bu anahtar� kendi anahtar�n�zla imzalamak istedi�inize ger�ekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:343
+#: g10/keyedit.c:326
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2076,33 +2119,33 @@ msgstr ""
 "Bu imza g�nderilemez olarak i�aretlenmi� olacak\n"
 "\n"
 
-#: g10/keyedit.c:348
+#: g10/keyedit.c:331
 msgid "Really sign? "
 msgstr "Ger�ekten imzalayacak m�s�n�z? "
 
-#: g10/keyedit.c:374 g10/keyedit.c:1925 g10/keyedit.c:1987 g10/sign.c:157
+#: g10/keyedit.c:362 g10/keyedit.c:2142 g10/keyedit.c:2204 g10/sign.c:225
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama ba�ar�s�z: %s\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:416
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmam��.\n"
 
-#: g10/keyedit.c:432
+#: g10/keyedit.c:420
 msgid "Secret parts of primary key are not available.\n"
 msgstr "As�l anahtar�n gizli par�alar� kullan�lamaz.\n"
 
-#: g10/keyedit.c:436
+#: g10/keyedit.c:424
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmu�.\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:444
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar �zerinde d�zenleme yap�lamaz: %s\n"
 
-#: g10/keyedit.c:461
+#: g10/keyedit.c:449
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2110,7 +2153,7 @@ msgstr ""
 "Bu gizli anahtar i�in yeni anahtar parolas� giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:473
+#: g10/keyedit.c:461
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2118,424 +2161,471 @@ msgstr ""
 "Bu gizli anahtar i�in yeni anahtar parolas� giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:476
+#: g10/keyedit.c:464
 msgid "Do you really want to do this? "
 msgstr "Ger�ekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:528
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzas�n� do�ru yere ta��yor\n"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:569
 msgid "quit this menu"
 msgstr "bu men�den ��k"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:570
 msgid "q"
 msgstr "�"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:571
 msgid "save and quit"
 msgstr "kaydet ve ��k"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "help"
 msgstr "yard�m"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:572
 msgid "show this help"
 msgstr "bunu g�sterir "
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:574
 msgid "show fingerprint"
 msgstr "parmak izini g�ster"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:575
 msgid "list key and user IDs"
 msgstr "anahtar� ve kullan�c� kimli�ini g�ster"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:576
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:577
 msgid "select user ID N"
 msgstr "N kullan�c� kimli�ini se�er"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:578
 msgid "select secondary key N"
 msgstr "N yard�mc� anahtar�n� se�er"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:579
 msgid "list signatures"
 msgstr "imzalar� listele"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:580
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:581
 msgid "sign the key"
 msgstr "anahtar� imzalar"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:582
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:583
 msgid "sign the key locally"
 msgstr "anahtar� yerel olarak imzala"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:584
 msgid "debug"
 msgstr "hata ay�klama"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:585
 msgid "add a user ID"
 msgstr "bir kullan�c� kimli�i ekler"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:586
 msgid "delete user ID"
 msgstr "kullan�c� kimli�ini siler"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:587
 msgid "add a secondary key"
 msgstr "bir yard�mc� anahtar ekler"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:588
 msgid "delete a secondary key"
 msgstr "bir yard�mc� anahtar siler"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:589
 msgid "delete signatures"
 msgstr "imzalar� siler"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "expire"
 msgstr "sonkulltarih"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:590
 msgid "change the expire date"
 msgstr "son kullan�m tarihini de�i�tirir"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:591
+msgid "primary"
+msgstr ""
+
+#: g10/keyedit.c:591
+msgid "flag user ID as primary"
+msgstr ""
+
+#: g10/keyedit.c:592
 msgid "toggle"
 msgstr "se�mece"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:592
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri aras�nda yer de�i�tirir"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:594
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:595
 msgid "pref"
 msgstr "�nayar"
 
-#: g10/keyedit.c:606 g10/keyedit.c:607
+#: g10/keyedit.c:595 g10/keyedit.c:596
 msgid "list preferences"
 msgstr "�nayarlar� listeler"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:596
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "setpref"
+msgstr "�nayar"
+
+#: g10/keyedit.c:597
+#, fuzzy
+msgid "set preference list"
+msgstr "�nayarlar� listeler"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updpref"
+msgstr "�nayar"
+
+#: g10/keyedit.c:598
+#, fuzzy
+msgid "updated preferences"
+msgstr "�nayarlar� listeler"
+
+#: g10/keyedit.c:599
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:599
 msgid "change the passphrase"
 msgstr "anahtar parolas�n� de�i�tirir"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "trust"
 msgstr "g�vence"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:600
 msgid "change the ownertrust"
 msgstr "sahibining�vencesini de�i�tirir"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revsig"
 msgstr "imzay�rkal"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:601
 msgid "revoke signatures"
 msgstr "imzalar� y�r�rl�kten kald�r�r"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revkey"
 msgstr "y�rkalanh"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:602
 msgid "revoke a secondary key"
 msgstr "bir yard�mc� anahtar� y�r�rl�kten kald�r�r"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable"
 msgstr "kald�r"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:603
 msgid "disable a key"
 msgstr "bir anahtar� kullan�mdan kald�r�r"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:613
+#: g10/keyedit.c:604
 msgid "enable a key"
 msgstr "bir anahtar� kullan�ma sokar"
 
-#: g10/delkey.c:110 g10/keyedit.c:633
+#: g10/delkey.c:112 g10/keyedit.c:624
 msgid "can't do that in batchmode\n"
 msgstr "bu �nceden belirlenmi� i�lemler kipinde (in batchmode) yap�lamaz\n"
 
-#. check that they match
-#. fixme: check that they both match
-#: g10/keyedit.c:671
+#: g10/keyedit.c:659
+#, fuzzy, c-format
+msgid "error reading secret keyblock `%s': %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: g10/keyedit.c:677
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:707
 msgid "Command> "
 msgstr "Komut-> "
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:738
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak i�in gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:734
+#: g10/keyedit.c:742
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "l�tfen �nce \"se�mece\" komutunu kullan�n.\n"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:789
 msgid "Really sign all user IDs? "
 msgstr "T�m kullan�c� kimlikleri ger�ekten imzalanacak m�? "
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:790
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "�pucu: �mzalamak i�in bir kullan�c� kimli�i se�iniz\n"
 
-#: g10/keyedit.c:814 g10/keyedit.c:1000
-#, c-format
-msgid "update of trustdb failed: %s\n"
-msgstr "g�vence veritaban�n�n g�ncellenmesi ba�ar�s�z: %s\n"
-
-#: g10/keyedit.c:825 g10/keyedit.c:846
+#: g10/keyedit.c:827 g10/keyedit.c:848
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullan�c� kimli�i se�melisiniz.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:829
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullan�c� kimli�ini silemezsiniz!\n"
 
-#: g10/keyedit.c:830
+#: g10/keyedit.c:832
 msgid "Really remove all selected user IDs? "
 msgstr "Se�ilen t�m kullan�c� kimlikleri ger�ekten silinecek mi? "
 
-#: g10/keyedit.c:831
+#: g10/keyedit.c:833
 msgid "Really remove this user ID? "
 msgstr "Bu kullan�c� kimli�i ger�ekten silinecek mi? "
 
-#: g10/keyedit.c:867 g10/keyedit.c:889
+#: g10/keyedit.c:871 g10/keyedit.c:893
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar se�melisiniz.\n"
 
-#: g10/keyedit.c:871
+#: g10/keyedit.c:875
 msgid "Do you really want to delete the selected keys? "
 msgstr "Se�ilen anahtarlar� ger�ekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:872
+#: g10/keyedit.c:876
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtar� ger�ekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:893
+#: g10/keyedit.c:897
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Se�ilen anahtarlar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
 
-#: g10/keyedit.c:894
+#: g10/keyedit.c:898
 msgid "Do you really want to revoke this key? "
 msgstr "Bu anahtar� ger�ekten y�r�rl�kten kald�rmak istiyor musunuz? "
 
 #: g10/keyedit.c:964
+#, fuzzy
+msgid "Really update the preferences for the selected user IDs? "
+msgstr "Se�ilen t�m kullan�c� kimlikleri ger�ekten silinecek mi? "
+
+#: g10/keyedit.c:966
+#, fuzzy
+msgid "Really update the preferences? "
+msgstr ""
+"Bu y�r�rl�kten kald�rma sertifikalar�n� ger�ekten olu�turacak m�s�n�z? (e/H)"
+
+#: g10/keyedit.c:1000
 msgid "Save changes? "
 msgstr "De�i�iklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
 msgid "Quit without saving? "
 msgstr "Kaydetmeden ��k�ls�n m�? "
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
 #, c-format
 msgid "update failed: %s\n"
 msgstr "g�ncelleme ba�ar�s�z: %s\n"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1021
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi g�ncelleme ba�ar�s�z: %s\n"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1028
 msgid "Key not changed so no update needed.\n"
 msgstr "G�ncelleme gere�i olmad���ndan anahtar de�i�medi.\n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1037
+#, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "g�vence veritaban�n�n g�ncellenmesi ba�ar�s�z: %s\n"
+
+#: g10/keyedit.c:1044
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut ge�ersiz (\"yard�m\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1131 g10/keyedit.c:1157
+#: g10/keyedit.c:1151 g10/keyedit.c:1177
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  �retildi: %s son kullanma tarihi: %s"
 
-#: g10/keyedit.c:1140
+#: g10/keyedit.c:1160
 #, c-format
 msgid " trust: %c/%c"
 msgstr " g�vence: %c/%c"
 
-#: g10/keyedit.c:1144
+#: g10/keyedit.c:1164
 msgid "This key has been disabled"
 msgstr "Bu anahtar kullan�mdan kald�r�lm��t�"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1193
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "y�rkal! yard�mc� anahtar y�r�rl�l�kten kald�r�lm��t�: %s\n"
 
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1196
 msgid "rev- faked revocation found\n"
 msgstr "y�rkal- sahte y�r�rl�kten kald�rma sertifikas� bulundu\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1198
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "y�rkal? Y�r�rl�kten kald�rma denetlenirken problem: %s\n"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1440
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu do�ru imza silinsin mi? (e/H/�)"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1444
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu ge�ersiz imza silinsin mi? (e/H/�)"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1448
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/�"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1454
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu �z-imza ger�ekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imzas� silindi.\n"
 
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1469
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d adet imza silindi.\n"
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1472
 msgid "Nothing deleted.\n"
 msgstr "Hi�bir �ey silinmedi.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1541
 msgid "Please remove selections from the secret keys.\n"
 msgstr "L�tfen gizli anahtarlardan se�ilenleri silin.\n"
 
-#: g10/keyedit.c:1527
+#: g10/keyedit.c:1547
 msgid "Please select at most one secondary key.\n"
 msgstr "L�tfen en fazla bir yard�mc� anahtar se�in.\n"
 
-#: g10/keyedit.c:1531
+#: g10/keyedit.c:1551
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yard�mc� anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
 
-#: g10/keyedit.c:1533
+#: g10/keyedit.c:1553
 msgid "Changing expiration time for the primary key.\n"
 msgstr "As�l anahtar i�in son kullanma tarihi de�i�tiriliyor.\n"
 
-#: g10/keyedit.c:1575
+#: g10/keyedit.c:1595
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtar�n�n son kullanma tarihini de�i�tiremezsiniz\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1611
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:1652
+#: g10/keyedit.c:1694
+#, fuzzy
+msgid "Please select exactly one user ID.\n"
+msgstr "En az bir kullan�c� kimli�i se�melisiniz.\n"
+
+#: g10/keyedit.c:1869
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullan�c� kimli�i yok\n"
 
-#: g10/keyedit.c:1698
+#: g10/keyedit.c:1915
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yard�mc� anahtar yok\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:2013
 msgid "user ID: \""
 msgstr "Kullan�c� kimli�i: \""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:2016
 #, c-format
 msgid ""
 "\"\n"
@@ -2544,156 +2634,175 @@ msgstr ""
 "\"\n"
 " %08lX anahtar�n�zla %s de imzaland�\n"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:2020
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 "Bu imza i�in bir y�r�rl�kten kald�rma sertifikas� olu�turulsun mu? (e/H)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1827
+#: g10/keyedit.c:2044
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullan�c� kimliklerini imzalam��s�n�z:\n"
 
-#: g10/keyedit.c:1841 g10/keyedit.c:1876
+#: g10/keyedit.c:2058 g10/keyedit.c:2093
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX taraf�ndan %s de imzaland�\n"
 
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2063
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX taraf�ndan %s de y�r�rl�kten kald�r�ld�\n"
 
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2083
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzalar� y�r�rl�kten kald�rmak �zeresiniz\n"
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:2101
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 "Bu y�r�rl�kten kald�rma sertifikalar�n� ger�ekten olu�turacak m�s�n�z? (e/H)"
 
-#: g10/keyedit.c:1913
+#: g10/keyedit.c:2130
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
 #. of subkey
-#: g10/keylist.c:279 g10/mainproc.c:851
+#: g10/keylist.c:294 g10/mainproc.c:863
 #, c-format
 msgid " [expires: %s]"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/mainproc.c:269
+#: g10/encr-data.c:66 g10/mainproc.c:255
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s �ifreli veri\n"
+
+#: g10/encr-data.c:68 g10/mainproc.c:257
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "bilinmeyen algoritma %d ile �ifrelenmi�\n"
+
+#: g10/mainproc.c:280
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "genel anahtar: %08lX\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:325
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtar �ifreli veri: do�ru DEK\n"
 
-#: g10/mainproc.c:366
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 "%u-bit %s anahtar� ve kullan�c� kimli�i %08lX ile �ifrelendi, %s "
 "olu�turuldu\n"
 
-#: g10/mainproc.c:376
+#: g10/mainproc.c:387
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s anahtar� ve kullan�c� kimli�i %08lX ile �ifrelendi\n"
 
-#: g10/mainproc.c:390
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar �ifre ��z�m� ba�ar�s�z: %s\n"
 
-#: g10/mainproc.c:430
+#. assume this is old style conventional encrypted data
+#: g10/mainproc.c:426
+#, fuzzy, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "%s �ifreli veri\n"
+
+#: g10/mainproc.c:443
 msgid "decryption okay\n"
 msgstr "�ifre ��zme tamam\n"
 
-#: g10/mainproc.c:435
+#: g10/mainproc.c:448
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: �ifreli ileti tahrip edilmi�!\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:453
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "�ifre ��zme ba�ar�s�z: %s\n"
 
-#: g10/mainproc.c:459
+#: g10/mainproc.c:472
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "B�LG�: g�nderen \"yaln�z-g�zleriniz-i�in\" ricas�nda bulundu\n"
 
-#: g10/mainproc.c:461
+#: g10/mainproc.c:474
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "�zg�n dosya ad� = '%.*s'\n"
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:645
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek ba��na y�r�rl�kten kald�rma - uygulamak i�in \"gpg --import\" kullan�n\n"
 
-#: g10/mainproc.c:719 g10/mainproc.c:728
+#: g10/mainproc.c:731 g10/mainproc.c:740
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: ge�ersiz niteleme verisi bulundu\n"
 
-#: g10/mainproc.c:731
+#: g10/mainproc.c:743
 msgid "Notation: "
 msgstr "Niteleme: "
 
-#: g10/mainproc.c:740
+#: g10/mainproc.c:752
 msgid "Policy: "
 msgstr "G�venlik: "
 
-#: g10/mainproc.c:1193
+#: g10/mainproc.c:1205
 msgid "signature verification suppressed\n"
 msgstr "imza do�rulama bast�r�ld�\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1235 g10/mainproc.c:1245
+#: g10/mainproc.c:1247 g10/mainproc.c:1257
 msgid "can't handle these multiple signatures\n"
 msgstr "bu �oklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1256
+#: g10/mainproc.c:1268
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s imzas�, %s anahtar� ve %08lX kullan�c� kimli�i ile yap�ld�\n"
 
-#. just in case that we have no userid
-#: g10/mainproc.c:1284 g10/mainproc.c:1292
+#: g10/mainproc.c:1302 g10/mainproc.c:1324
 msgid "BAD signature from \""
 msgstr "K�T� imza: \""
 
-#: g10/mainproc.c:1285 g10/mainproc.c:1293
+#: g10/mainproc.c:1303 g10/mainproc.c:1325
 msgid "Good signature from \""
 msgstr "Do�ru imza: \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1327
+msgid "[uncertain]"
+msgstr ""
+
+#: g10/mainproc.c:1347
 msgid "                aka \""
 msgstr "                den \""
 
-#: g10/mainproc.c:1358
+#: g10/mainproc.c:1397
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1427 g10/mainproc.c:1443 g10/mainproc.c:1505
+#: g10/mainproc.c:1466 g10/mainproc.c:1482 g10/mainproc.c:1544
 msgid "not a detached signature\n"
 msgstr "bir ba��ms�z imza de�il\n"
 
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1493
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x s�n�f� tek ba��na imza\n"
 
-#: g10/mainproc.c:1511
+#: g10/mainproc.c:1550
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1557
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() i�inde ge�ersiz k�k paket saptand�\n"
 
@@ -2717,7 +2826,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritmas� kullan�lamad�\n"
 
-#: g10/parse-packet.c:1010
+#: g10/parse-packet.c:1027
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit k�mesine sahip\n"
@@ -2730,12 +2839,12 @@ msgstr "gpg-agent bu oturumda kullan�lamaz\n"
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO �evre de�i�keni bozuk\n"
 
-#: g10/hkp.c:167 g10/passphrase.c:248
+#: g10/hkp.c:169 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna ba�lan�lamad�: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:580
+#: g10/passphrase.c:313 g10/passphrase.c:578
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (as�l anahtar kimli�i %08lX)"
@@ -2776,7 +2885,7 @@ msgstr "kullan�c� taraf�ndan iptal edildi\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonu�land�\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:564
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2786,20 +2895,20 @@ msgstr ""
 "Gizli anahtar�n kilidini a�mak i�in bir anahtar parolas�na ihtiyac�n�z var.\n"
 "Anahtar�n sahibi: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:573
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s anahtar�, kimlik: %08lX, olu�turuldu %s"
 
-#: g10/passphrase.c:613
+#: g10/passphrase.c:611
 msgid "can't query password in batchmode\n"
 msgstr "�nceden tan�mlanm�� i�lemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:617
+#: g10/passphrase.c:615
 msgid "Enter passphrase: "
 msgstr "Anahtar parolas�n� girin: "
 
-#: g10/passphrase.c:621
+#: g10/passphrase.c:619
 msgid "Repeat passphrase: "
 msgstr "Tekrar:"
 
@@ -2807,51 +2916,56 @@ msgstr "Tekrar:"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek i�in \"--output\" se�ene�ini kullan�n\n"
 
-#: g10/plaintext.c:332
+#: g10/plaintext.c:108
+#, fuzzy, c-format
+msgid "error creating `%s': %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: g10/plaintext.c:336
 msgid "Detached signature.\n"
 msgstr "Ba��ms�z imza.\n"
 
-#: g10/plaintext.c:336
+#: g10/plaintext.c:340
 msgid "Please enter name of data file: "
 msgstr "L�tfen veri dosyas�n�n ismini girin: "
 
-#: g10/plaintext.c:357
+#: g10/plaintext.c:361
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:391
+#: g10/plaintext.c:395
 msgid "no signed data\n"
 msgstr "imzal� veri yok\n"
 
-#: g10/plaintext.c:399
+#: g10/plaintext.c:403
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzal� veri: %s  a��lamad�\n"
 
-#: g10/pubkey-enc.c:76
+#: g10/pubkey-enc.c:99
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonim al�c�; %08lX gizli anahtar� deneniyor ...\n"
 
-#: g10/pubkey-enc.c:82
+#: g10/pubkey-enc.c:105
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim al�c�y�z.\n"
 
-#: g10/pubkey-enc.c:134
+#: g10/pubkey-enc.c:157
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlamas� desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:153
+#: g10/pubkey-enc.c:176
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "%d �ifre algoritmas� bilinmiyor ya da kullan�m d���\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "B�LG�: %d �ifre algoritmas� �nayarlarda bulunamad�\n"
 
-#: g10/pubkey-enc.c:198
+#: g10/pubkey-enc.c:238
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "B�LG�: %08lX gizli anahtar�n�n %s tarihinde kullan�m s�resi doldu\n"
@@ -2866,26 +2980,26 @@ msgstr "%08lX anahtar� %s den isteniyor ...\n"
 msgid "can't get key from keyserver: %s\n"
 msgstr "%s anahtar sunucusundan anahtar al�namad�\n"
 
-#: g10/hkp.c:102 g10/hkp.c:136
+#: g10/hkp.c:102 g10/hkp.c:138
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "anahtar sunucu bilinmiyor (--keyserver se�ene�i ile belirtin)\n"
 
-#: g10/hkp.c:110
+#: g10/hkp.c:112
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ge�erli bir anahtar kimli�i de�il\n"
 
-#: g10/hkp.c:191
+#: g10/hkp.c:193
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "\"%s\" sunucusuna g�nderme hatas�: %s\n"
 
-#: g10/hkp.c:203
+#: g10/hkp.c:205
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "\"%s\" sunucusuna g�nderme i�lemi ba�ar�l� (durum=%u)\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:208
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "\"%s\" sunucusuna g�nderme i�lemi ba�ar�s�z (durum=%u)\n"
@@ -2909,57 +3023,62 @@ msgstr ""
 "UYARI: Zay�f anahtar saptand� - l�tfen anahtar parolas�n� tekrar "
 "de�i�tirin.\n"
 
-#: g10/sig-check.c:199
+#: g10/sig-check.c:201
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "Hatal� MDC'nin bilinmeyen bir kritik bitten kaynakland��� san�l�yor\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:299
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "Bu, imzalar i�in g�venli olmayan PGP �retimi bir ElGamal anahtar�!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:307
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:308
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "genel anahtar imzadan %lu saniye daha yeni.\n"
 
-#: g10/sig-check.c:328
+#: g10/sig-check.c:330
 #, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "B�LG�: %08lX imza anahtar�n�n kullan�m s�resi %s tarihinde dolmu�\n"
 
-#: g10/sig-check.c:398
+#: g10/sig-check.c:402
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "Hatal� imzan�n bilinmeyen bir kritik bitten kaynakland��� san�l�yor\n"
 
-#: g10/sign.c:152
+#: g10/sign.c:220
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "olu�turulan imzan�n denetimi ba�ar�s�z: %s\n"
 
-#: g10/sign.c:161
+#: g10/sign.c:229
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s imza: %s den\n"
 
-#: g10/sign.c:307 g10/sign.c:630
+#: g10/sign.c:376
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "UYARI: \"%s\" dosyas� bo�\n"
+
+#: g10/sign.c:566 g10/sign.c:721
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s olu�turulamad�: %s\n"
 
-#: g10/sign.c:405
+#: g10/sign.c:627
 msgid "signing:"
 msgstr "imzalan�yor:"
 
-#: g10/sign.c:448
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "UYARI: \"%s\" dosyas� bo�\n"
+#: g10/sign.c:860
+#, fuzzy, c-format
+msgid "%s encryption will be used\n"
+msgstr "�ifre ��zme ba�ar�s�z: %s\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -2971,12 +3090,12 @@ msgstr "%d karakterden daha uzun metin sat�rlar� okunamaz\n"
 msgid "input line longer than %d characters\n"
 msgstr "girdi sat�r� %d karakterden daha uzun\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1623
+#: g10/tdbio.c:116 g10/tdbio.c:1638
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "g�vence veritaban� %lu kayd�: arama ba�ar�s�z: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1630
+#: g10/tdbio.c:122 g10/tdbio.c:1645
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "g�vence veritaban� %lu kayd�: yazma ba�ar�s�z (n=%d): %s\n"
@@ -2985,113 +3104,118 @@ msgstr "g�vence veritaban� %lu kayd�: yazma ba�ar�s�z (n=%d): %s\n"
 msgid "trustdb transaction too large\n"
 msgstr "g�vence veritaban� i�lemi �ok uzun\n"
 
-#: g10/tdbio.c:424
+#: g10/tdbio.c:425
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: eri�ilemedi: %s\n"
 
-#: g10/tdbio.c:438
+#: g10/tdbio.c:439
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/openfile.c:240 g10/openfile.c:307 g10/ringedit.c:1371 g10/tdbio.c:444
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr "%s: olu�turulamad�: %s\n"
-
-#: g10/tdbio.c:459 g10/tdbio.c:508
+#: g10/tdbio.c:449 g10/tdbio.c:469 g10/tdbio.c:519
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: kilit olu�turulamad�\n"
 
-#: g10/tdbio.c:473
+#: g10/tdbio.c:451 g10/tdbio.c:522
+#, fuzzy, c-format
+msgid "%s: can't make lock\n"
+msgstr "%s: kilit olu�turulamad�\n"
+
+#: g10/keyring.c:862 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:455
+#, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: olu�turulamad�: %s\n"
+
+#: g10/tdbio.c:484
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: s�r�m kayd� olu�turmada ba�ar�s�z: %s"
 
-#: g10/tdbio.c:477
+#: g10/tdbio.c:488
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ge�ersiz g�vence veritaban� olu�turuldu\n"
 
-#: g10/tdbio.c:480
+#: g10/tdbio.c:491
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: g�vence veritaban� olu�turuldu\n"
 
-#: g10/tdbio.c:517
+#: g10/tdbio.c:532
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: g�vence veritaban� ge�ersiz\n"
 
-#: g10/tdbio.c:550
+#: g10/tdbio.c:565
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hash tablosu olu�turma ba�ar�s�z: %s\n"
 
-#: g10/tdbio.c:558
+#: g10/tdbio.c:573
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: s�r�m kayd�n�n g�ncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
-#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
+#: g10/tdbio.c:589 g10/tdbio.c:628 g10/tdbio.c:650 g10/tdbio.c:680
+#: g10/tdbio.c:705 g10/tdbio.c:1571 g10/tdbio.c:1598
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: s�r�m kayd�n�n okunmas�nda hata: %s\n"
 
-#: g10/tdbio.c:587 g10/tdbio.c:646
+#: g10/tdbio.c:602 g10/tdbio.c:661
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: s�r�m kayd�n�n yaz�lmas�nda hata: %s\n"
 
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1250
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "g�vence veritaban�: arama ba�ar�s�z: %s\n"
 
-#: g10/tdbio.c:1243
+#: g10/tdbio.c:1258
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "g�vence veritaban�: okuma ba�ar�s�z (n=%d): %s\n"
 
-#: g10/tdbio.c:1264
+#: g10/tdbio.c:1279
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir g�vence veritaban� dosyas� de�il\n"
 
-#: g10/tdbio.c:1280
+#: g10/tdbio.c:1295
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kay�t numaras� ile s�r�m kayd�\n"
 
-#: g10/tdbio.c:1285
+#: g10/tdbio.c:1300
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya s�r�m� %d ge�ersiz\n"
 
-#: g10/tdbio.c:1589
+#: g10/tdbio.c:1604
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kayd� okuma hatas�: %s\n"
 
-#: g10/tdbio.c:1597
+#: g10/tdbio.c:1612
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kayd�n� yazma hatas�: %s\n"
 
-#: g10/tdbio.c:1607
+#: g10/tdbio.c:1622
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kay�t s�f�rlama ba�ar�s�z: %s\n"
 
-#: g10/tdbio.c:1637
+#: g10/tdbio.c:1652
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kay�t ekleme ba�ar�s�z: %s\n"
 
-#: g10/tdbio.c:1748
+#: g10/tdbio.c:1763
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "g�vence veritaban� bozulmu�; l�tfen \"gpg --fix-trustdb\" �al��t�r�n.\n"
@@ -3142,8 +3266,8 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record:  search_record ba�ar�s�z: %s\n"
 
 #: g10/trustdb.c:474
-#, c-format
-msgid "'%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "`%s' is not a valid long keyID\n"
 msgstr "\"%s\" ge�erli bir uzun anahtar kimli�i de�il\n"
 
 #: g10/trustdb.c:501
@@ -3176,218 +3300,214 @@ msgstr "%08lX anahtar�: g�venceli anahtar i�in genel anahtar yok - atland�\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "Bilgi: %08lX gizli anahtar� korunmu� DE��L.\n"
 
-#: g10/trustdb.c:584
+#: g10/trustdb.c:585
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "%08lX anahtar�: gizli ve genel anahtarlar e�le�miyor\n"
 
-#: g10/trustdb.c:597
+#: g10/trustdb.c:598
 #, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "gizli anahtarlar�n listelenmesi ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:987
+#: g10/trustdb.c:988
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "anahtar %08lX.%lu: Do�ru yard�mc� anahtar ba�lant�s�\n"
 
-#: g10/trustdb.c:993 g10/trustdb.c:1028
+#: g10/trustdb.c:994 g10/trustdb.c:1029
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "anahtar %08lX.%lu: Yard�mc� anahtar ba�lant�s� ge�ersiz: %s\n"
 
-#: g10/trustdb.c:1005
+#: g10/trustdb.c:1006
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "anahtar %08lX.%lu: Anahtar�n y�r�rl�kten kald�r�lmas� ge�erli\n"
 
-#: g10/trustdb.c:1011
+#: g10/trustdb.c:1012
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "anahtar %08lX.%lu: Anahtar�n y�r�rl�kten kald�r�lmas� ge�ersiz: %s\n"
 
-#: g10/trustdb.c:1022
+#: g10/trustdb.c:1023
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 "anahtar %08lX.%lu: Yard�mc� anahtar�n y�r�rl�kten kald�r�lmas� ge�erli\n"
 
-#: g10/trustdb.c:1133
+#: g10/trustdb.c:1134
 msgid "Good self-signature"
 msgstr "Do�ru �z-imza"
 
-#: g10/trustdb.c:1143
+#: g10/trustdb.c:1144
 msgid "Invalid self-signature"
 msgstr "Ge�ersiz �z-imza"
 
-#: g10/trustdb.c:1170
+#: g10/trustdb.c:1171
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Daha yeni bir �z-imzadan dolay� ge�erli kullan�c� kimli�in y�r�rl�kten "
 "kald�r�lmas� atland�"
 
-#: g10/trustdb.c:1176
+#: g10/trustdb.c:1177
 msgid "Valid user ID revocation"
 msgstr "Kullan�c� kimli�in y�r�rl�kten kald�r�lmas� ge�erli"
 
-#: g10/trustdb.c:1181
+#: g10/trustdb.c:1182
 msgid "Invalid user ID revocation"
 msgstr "Kullan�c� kimli�in y�r�rl�kten kald�r�lmas� ge�ersiz"
 
-#: g10/trustdb.c:1223
+#: g10/trustdb.c:1224
 msgid "Valid certificate revocation"
 msgstr "Sertifikan�n y�r�rl�kten kald�r�lmas� ge�erli"
 
-#: g10/trustdb.c:1224
+#: g10/trustdb.c:1225
 msgid "Good certificate"
 msgstr "Do�ru sertifika"
 
-#: g10/trustdb.c:1252
+#: g10/trustdb.c:1253
 msgid "Invalid certificate revocation"
 msgstr "Sertifikan�n y�r�rl�kten kald�r�lmas� ge�ersiz"
 
-#: g10/trustdb.c:1253
+#: g10/trustdb.c:1254
 msgid "Invalid certificate"
 msgstr "Ge�ersiz sertifika"
 
-#: g10/trustdb.c:1270 g10/trustdb.c:1274
+#: g10/trustdb.c:1271 g10/trustdb.c:1275
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "imza kayd� %lu[%d] yanl�� kayd� g�steriyor.\n"
 
-#: g10/trustdb.c:1333
+#: g10/trustdb.c:1334
 msgid "duplicated certificate - deleted"
 msgstr "kopyalanm�� sertifika - silindi"
 
-#: g10/trustdb.c:1650
+#: g10/trustdb.c:1587
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:1784
+#: g10/trustdb.c:1727
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "LID ?: yerle�tirme ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:1789
+#: g10/trustdb.c:1732
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "LID %lu: yerle�tirme ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:1795
+#: g10/trustdb.c:1738
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "LID %lu: yerle�tirildi\n"
 
-#: g10/trustdb.c:1800
+#: g10/trustdb.c:1743
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "dizin kayd�n� okumada hata: %s\n"
 
-#: g10/trustdb.c:1808 g10/trustdb.c:1871
+#: g10/trustdb.c:1751 g10/trustdb.c:1814
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu anahtar i�lendi\n"
 
-#: g10/trustdb.c:1810 g10/trustdb.c:1877
+#: g10/trustdb.c:1753 g10/trustdb.c:1820
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu anahtar hatal�\n"
 
-#: g10/trustdb.c:1812
+#: g10/trustdb.c:1755
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu anahtar yerle�tirildi\n"
 
-#: g10/trustdb.c:1815
+#: g10/trustdb.c:1758
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "anahtar bloklar�n�n listelenmesi ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:1863
+#: g10/trustdb.c:1806
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "LID %lu: dizin kayd� anahtars�z - atland�\n"
 
-#: g10/trustdb.c:1873
+#: g10/trustdb.c:1816
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu yeni genel anahtardan dolay�\n"
 
-#: g10/trustdb.c:1875
+#: g10/trustdb.c:1818
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu anahtar atland�\n"
 
-#: g10/trustdb.c:1879
+#: g10/trustdb.c:1822
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu anahtar g�ncellendi\n"
 
-#: g10/trustdb.c:2224
+#: g10/trustdb.c:2167
 msgid "Ooops, no keys\n"
 msgstr "Hooop, anahtarlar yok\n"
 
-#: g10/trustdb.c:2228
+#: g10/trustdb.c:2171
 msgid "Ooops, no user IDs\n"
 msgstr "Hooop, kullan�c� kimli�i yok\n"
 
-#: g10/trustdb.c:2386
+#: g10/trustdb.c:2329
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: dizin kayd�n�n aranmas� ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:2395
+#: g10/trustdb.c:2338
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "%08lX anahtar�: g�vence kayd�n�n yerle�tirilmesi ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:2399
+#: g10/trustdb.c:2342
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "anahtar %08lX.%lu: g�vence veritaban�na yerle�tirildi\n"
 
-#: g10/trustdb.c:2407
+#: g10/trustdb.c:2350
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %08lX.%lu: gelecekte olu�turulmu�\n"
 "(zaman sapmas� ya da saat problemi)\n"
 
-#: g10/trustdb.c:2422
+#: g10/trustdb.c:2365
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "anahtar %08lX.%lu: %s tarihinde kullan�m s�resi doldu\n"
 
-#: g10/trustdb.c:2430
+#: g10/trustdb.c:2373
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "anahtar %08lX.%lu: g�vence kontrolu ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:2581
+#: g10/trustdb.c:2524
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "kullan�c� \"%s\" bulunamad�: %s\n"
 
-#: g10/trustdb.c:2583
+#: g10/trustdb.c:2526
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "\"%s\"in g�vence veritaban�nda bulunmas�nda problem: %s\n"
 
-#: g10/trustdb.c:2586
+#: g10/trustdb.c:2529
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "kullan�c� \"%s\" g�vence veritaban�nda de�il - yerle�tirildi\n"
 
-#: g10/trustdb.c:2589
+#: g10/trustdb.c:2532
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "\"%s\"in g�vence veritaban�na konulmas� ba�ar�s�z: %s\n"
 
-#: g10/trustdb.c:2775 g10/trustdb.c:2805
-msgid "WARNING: can't yet handle long pref records\n"
-msgstr "UYARI: uzun �nayar kay�tlar� hen�z elde edilemedi\n"
-
 #: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
@@ -3403,34 +3523,6 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "girdi sat�r� %u ya �ok uzun ya da sonunda LF yok\n"
 
-#: g10/ringedit.c:302
-#, c-format
-msgid "%s: can't create keyring: %s\n"
-msgstr "%s: anahtar demeti olu�turulamad�: %s\n"
-
-#: g10/ringedit.c:319 g10/ringedit.c:1376
-#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: anahtar demeti olu�turuldu\n"
-
-#: g10/ringedit.c:1557
-msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "UYARI: gizli bilgi i�eren 2 dosya mevcut.\n"
-
-#: g10/ringedit.c:1558
-#, c-format
-msgid "%s is the unchanged one\n"
-msgstr "%s de�i�meyen\n"
-
-#: g10/ringedit.c:1559
-#, c-format
-msgid "%s is the new one\n"
-msgstr "%s yeni olan\n"
-
-#: g10/ringedit.c:1560
-msgid "Please fix this possible security flaw\n"
-msgstr "L�tfen bu g�venlik �atla��n� giderin\n"
-
 #: g10/skclist.c:110 g10/skclist.c:166
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
@@ -3507,22 +3599,12 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "Yeni se�enekler dosyas�n�n okunabilmesi i�in GnuPG yeniden ba�lat�lmal�d�r\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s �ifreli veri\n"
-
-#: g10/encr-data.c:68
-#, c-format
-msgid "encrypted with unknown algorithm %d\n"
-msgstr "bilinmeyen algoritma %d ile �ifrelenmi�\n"
-
-#: g10/encr-data.c:90
+#: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik �ifre i�indeki zay�f bir anahtarla �ifrelendi.\n"
 
-#: g10/encr-data.c:97
+#: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
 msgstr "�ifreli paketin elde edilmesinde sorun var\n"
 
@@ -3537,23 +3619,28 @@ msgstr ""
 "simetrik �ifre i�in zay�f anahtar�n �nlenmesi m�mk�n olamad�: %d kere "
 "denendi!\n"
 
-#: g10/delkey.c:114
+#: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "�nceden belirlenmi� i�lemler kipinde \"--yes\" olmaks�z�n yap�lamaz\n"
 
-#: g10/delkey.c:136
+#: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
 msgstr "Bu anahtar, anahtar demetinden silinsin mi? "
 
-#: g10/delkey.c:144
+#: g10/delkey.c:146
 msgid "This is a secret key! - really delete? "
 msgstr "Bu bir gizli anahtar! - ger�ekten silinecek mi? "
 
-#: g10/delkey.c:181
+#: g10/delkey.c:156
+#, fuzzy, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "anahtar bloklar�n�n listelenmesi ba�ar�s�z: %s\n"
+
+#: g10/delkey.c:184
 msgid "there is a secret key for this public key!\n"
 msgstr "Bu genel anahtar i�in bir gizli anahtar var!\n"
 
-#: g10/delkey.c:183
+#: g10/delkey.c:186
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "silmek i�in �nce \"--delete-secret-key\" se�ene�ini kullan�n.\n"
 
@@ -3742,7 +3829,14 @@ msgstr ""
 "Bunu sadece, e�er bu �z-imza baz� durumlarda ge�erli de�ilse ya da\n"
 "kullan�labilir bir ikincisi var ise yap�n."
 
-#: g10/helptext.c:202
+#: g10/helptext.c:201
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences.  The timestamp of all affected\n"
+"self-signatures fill be advanced by one second.\n"
+msgstr ""
+
+#: g10/helptext.c:208
 msgid ""
 "Please enter the passhrase; this is a secret sentence \n"
 "  Blurb, blurb,.... "
@@ -3750,19 +3844,19 @@ msgstr ""
 "L�tfen anahtar parolan�z� girin; bu gizli bir c�mle \n"
 "  Blurb, blurb,.... "
 
-#: g10/helptext.c:209
+#: g10/helptext.c:215
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
 msgstr "L�tfen son parolay� tekrarlayarak parolan�n ne oldu�undan emin olun."
 
-#: g10/helptext.c:213
+#: g10/helptext.c:219
 msgid "Give the name of the file to which the signature applies"
 msgstr "�mzan�n uygulanaca�� dosyan�n ismini verin"
 
-#: g10/helptext.c:218
+#: g10/helptext.c:224
 msgid "Answer \"yes\" if it is okay to overwrite the file"
 msgstr "Dosyan�n �zerine yaz�lacaksa l�tfen \"evet\" yaz�n"
 
-#: g10/helptext.c:223
+#: g10/helptext.c:229
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
@@ -3770,7 +3864,7 @@ msgstr ""
 "L�tfen yeni dosya ismini girin. Dosya ismini yazmadan RETURN tu�larsan�z\n"
 "parantez i�inde g�sterilen �ntan�ml� dosya kullan�lacak."
 
-#: g10/helptext.c:229
+#: g10/helptext.c:235
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
@@ -3798,7 +3892,7 @@ msgstr ""
 "\tKullan�c� kimli�i art�k kullan�lamayacak durumdaysa bunu\n"
 "        se�in; genelde Eposta adresi ge�ersiz oldu�unda kullan�l�r.\n"
 
-#: g10/helptext.c:245
+#: g10/helptext.c:251
 msgid ""
 "If you like, you can enter a text describing why you issue this\n"
 "revocation certificate.  Please keep this text concise.\n"
@@ -3808,11 +3902,80 @@ msgstr ""
 "verdi�inizi a��klayan bir metin girebilirsiniz.\n"
 "L�tfen bu metin k�sa olsun. Bir bo� sat�r metni bitirir.\n"
 
-#: g10/helptext.c:260
+#: g10/helptext.c:266
 msgid "No help available"
 msgstr "yard�m mevcut de�il"
 
-#: g10/helptext.c:268
+#: g10/helptext.c:274
 #, c-format
 msgid "No help available for `%s'"
 msgstr "\"%s\" i�in yard�m mevcut de�il"
+
+#: g10/keydb.c:170
+#, fuzzy, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "\"%s\" anahtar demetini yazarken hata: %s\n"
+
+#: g10/keydb.c:179
+#, c-format
+msgid "changing permission of  `%s' failed: %s\n"
+msgstr ""
+
+#: g10/keydb.c:188
+#, fuzzy, c-format
+msgid "keyring `%s' created\n"
+msgstr "%s: anahtar demeti olu�turuldu\n"
+
+#: g10/keyring.c:867
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: anahtar demeti olu�turuldu\n"
+
+#: g10/keyring.c:1044
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "UYARI: gizli bilgi i�eren 2 dosya mevcut.\n"
+
+#: g10/keyring.c:1045
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s de�i�meyen\n"
+
+#: g10/keyring.c:1046
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s yeni olan\n"
+
+#: g10/keyring.c:1047
+msgid "Please fix this possible security flaw\n"
+msgstr "L�tfen bu g�venlik �atla��n� giderin\n"
+
+#~ msgid "too many random bits requested; the limit is %d\n"
+#~ msgstr "�ok fazla rasgele bit istendi; s�n�r: %d\n"
+
+#~ msgid "For info see http://www.gnupg.org"
+#~ msgstr "Bilgi i�in http://www.gnupg.org adresine bak�n"
+
+#~ msgid "   (%d) RSA (sign and encrypt)\n"
+#~ msgstr "   (%d) RSA (imzalamak ve �ifrelemek i�in)\n"
+
+#~ msgid "Do you really want to create a sign and encrypt key? "
+#~ msgstr ""
+#~ "Bir imza ve �ifreleme anahtar� olu�turmay� ger�ekten istiyor musunuz? "
+
+#~ msgid "%s: user not found: %s\n"
+#~ msgstr "%s: kullan�c� bulunamad�: %s\n"
+
+#~ msgid "certificate read problem: %s\n"
+#~ msgstr "sertifika okuma problemi: %s\n"
+
+#~ msgid "can't lock keyring `%s': %s\n"
+#~ msgstr "\"%s\" anahtar demeti kilitlenemez: %s\n"
+
+#~ msgid "%s: user not found\n"
+#~ msgstr "%s: kullan�c� bulunamad�\n"
+
+#~ msgid "WARNING: can't yet handle long pref records\n"
+#~ msgstr "UYARI: uzun �nayar kay�tlar� hen�z elde edilemedi\n"
+
+#~ msgid "%s: can't create keyring: %s\n"
+#~ msgstr "%s: anahtar demeti olu�turulamad�: %s\n"