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  <wk@gnupg.org>
 
+	* 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  <wk@gnupg.org>
+
+	* POTFILES.in: Added new files.
+
 2001-07-26  gettextize  <bug-gnu-utils@gnu.org>
 
 	* 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 <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\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
 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 
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (kryptér kun)\n"
+
+#: 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
 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
 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
 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
-#, c-format
-msgid "%s: can't create: %s\n"
-msgstr ""
-
-#: 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 ""
 
-#: 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 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: %s\n"
+msgstr ""
+
+#: 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
 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 <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\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 
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/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
 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
 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
 #. * 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) <heinrichh@duesseldorf.de>\"\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
 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
 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
 #. * 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
 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
 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
 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 <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\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 
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (nur æifri)\n"
+
+#: 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 "
 #. * 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) <heinrichh@duesseldorf.de>\"\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 "
 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 
 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 "
 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 "
 #. * 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 "
 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 
 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 "
 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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\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
 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
 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
 #. * 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) <heinrichh@duesseldorf.de>\"\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
 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
 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
 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
 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
 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
 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
 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 <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\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
 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
 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
 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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
+
+#: 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
 #. * 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) <heinrichh@duesseldorf.de>\"\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
 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
 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
 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
 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
 #. * 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
 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
 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
 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 <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\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
 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'
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies à <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: g10/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 
 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
 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
 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) <heinrichh@duesseldorf.de> »\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
 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
 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
 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
 #. * 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
 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
 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
 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
 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
 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 <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <id@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\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) <heinrichh@duesseldorf.de>\"\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 <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (cifra solo)\n"
+
+#: 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 
 #. * 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) <heinrichh@duesseldorf.de>\"\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 
 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 
 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
 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 <y-iida@secom.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\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'
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "¥Ğ¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Ş¤Ç¤´Êó¹ğ¤¯¤À¤µ¤¤¡£\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 "
 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 "
 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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
+
+#: 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 "
 #. * 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) <heinrichh@duesseldorf.de>\"\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: 
 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 "
 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 "       
 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 "
 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 "
 #. * 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 "
 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 "̵
 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ʸ
 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 "
 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 "
 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: 
 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 "
 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 <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (alleen versleutelen)\n"
+
+#: 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) <heinrichh@duesseldorf.de>\"\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
 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
 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 <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\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
 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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\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
 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) <tzb@domena.pl>\"\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
 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
 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
 #. * 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
 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
 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
 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
 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 <jungmann@usa.net>\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
 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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\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
 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 
 #. * 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) <heinrichh@duesseldorf.de>\"\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
 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
 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
 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
 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
 #~ 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
 #~ 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 <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\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
 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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\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
 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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas cifragem)\n"
+
+#: 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 
 #. * 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) <heinrichh@duesseldorf.de>\"\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
 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
 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
 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
 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
 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 <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv@li.org>.\n"
 
-#: g10/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
 # ä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
 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
 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:561
+#: g10/keygen.c:758
+#, fuzzy, c-format
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) ElGamal (endast kryptering)\n"
+
+#: 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 
 #. * 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) <gustav@trekronor.se>\"\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 
 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 
 #. * 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ä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
 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
 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
 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
 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 
 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 <nilgun@fide.org>\n"
 "Language-Team: Turkish <tr@li.org>\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
 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
 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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> 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
 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
 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
 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:561
+#: 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: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) <fsmehmet@topkapi.tr>\"\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
 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
 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
 #. * 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
 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
 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
 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
 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
 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
 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"